diff --git a/dpaste/tests/__init__.py b/dpaste/tests/__init__.py
index eac8a73..e69de29 100644
--- a/dpaste/tests/__init__.py
+++ b/dpaste/tests/__init__.py
@@ -1,4 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-from .test_api import *
-from .test_snippet import *
diff --git a/dpaste/tests/test_snippet.py b/dpaste/tests/test_snippet.py
index e4e521b..c0171d9 100644
--- a/dpaste/tests/test_snippet.py
+++ b/dpaste/tests/test_snippet.py
@@ -9,9 +9,8 @@ from django.test import TestCase
 from django.test.client import Client
 from django.test.utils import override_settings
 
-from dpaste.highlight import PygmentsHighlighter
 from ..forms import EXPIRE_DEFAULT
-from ..highlight import LEXER_DEFAULT, PLAIN_CODE, PLAIN_TEXT
+from ..highlight import LEXER_DEFAULT, PLAIN_CODE, PLAIN_TEXT, PygmentsHighlighter
 from ..models import Snippet
 
 
diff --git a/dpaste/views.py b/dpaste/views.py
index 53d9e82..95a33ee 100644
--- a/dpaste/views.py
+++ b/dpaste/views.py
@@ -295,8 +295,6 @@ class APIView(View):
 # -----------------------------------------------------------------------------
 
 def page_not_found(request, exception=None, template_name='dpaste/404.html'):
-    if not exception: # Django <1.8
-        return django_page_not_found(request, template_name=template_name)
     return django_page_not_found(request, exception, template_name=template_name)
 
 def server_error(request, template_name='dpaste/500.html'):