diff --git a/tests/regressiontests/inspectdb/bug/__init__.py b/tests/regressiontests/inspectdb/bug/__init__.py
deleted file mode 100644
index 8b13789179..0000000000
--- a/tests/regressiontests/inspectdb/bug/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/regressiontests/inspectdb/bug/models.py b/tests/regressiontests/inspectdb/bug/models.py
deleted file mode 100644
index 6fec2273e0..0000000000
--- a/tests/regressiontests/inspectdb/bug/models.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.db import models
-
-class People(models.Model):
-    name = models.CharField(max_length=255)
-
-class Message(models.Model):
-    from_field = models.ForeignKey(People, db_column='from_id')
diff --git a/tests/regressiontests/inspectdb/models.py b/tests/regressiontests/inspectdb/models.py
index 8b13789179..fc2548b441 100644
--- a/tests/regressiontests/inspectdb/models.py
+++ b/tests/regressiontests/inspectdb/models.py
@@ -1 +1,8 @@
+from django.db import models
 
+
+class People(models.Model):
+    name = models.CharField(max_length=255)
+
+class Message(models.Model):
+    from_field = models.ForeignKey(People, db_column='from_id')
diff --git a/tests/regressiontests/inspectdb/tests.py b/tests/regressiontests/inspectdb/tests.py
index 30c7948b22..c6f9e6f88a 100644
--- a/tests/regressiontests/inspectdb/tests.py
+++ b/tests/regressiontests/inspectdb/tests.py
@@ -1,29 +1,14 @@
-import os
-import sys
 from StringIO import StringIO
 
-from django.conf import settings
 from django.core.management import call_command
-from django.db.models.loading import load_app
 from django.test import TestCase
 
+
 class InspectDBTestCase(TestCase):
-    
-    def setUp(self):
-        self.old_sys_path = sys.path[:]
-        sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-        self.old_installed_apps = settings.INSTALLED_APPS
-        settings.INSTALLED_APPS = ('bug',)
-        map(load_app, settings.INSTALLED_APPS)
-        call_command('syncdb', verbosity=0)
-        
     def test_attribute_name_not_python_keyword(self):
         out = StringIO()
         call_command('inspectdb', stdout=out)
         error_message = "inspectdb generated an attribute name which is a python keyword"
-        self.assertNotIn("from = models.ForeignKey(BugPeople)", out.getvalue(), msg=error_message)
+        self.assertNotIn("from = models.ForeignKey(InspectdbPeople)", out.getvalue(), msg=error_message)
+        self.assertIn("from_field = models.ForeignKey(InspectdbPeople)", out.getvalue())
         out.close()
-        
-    def tearDown(self):
-        settings.INSTALLED_APPS = self.old_installed_apps
-        sys.path = self.old_sys_path