diff --git a/.gitignore b/.gitignore
index 85000b33d..874df157d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,8 +23,6 @@ dump.json
 media
 *.orig
 
-course/fixtures/
-xmlrunner/
 test_results/
 
 selenium_test/aplus.out
diff --git a/a-plus/settings.py b/a-plus/settings.py
index 29085be07..b7712449e 100644
--- a/a-plus/settings.py
+++ b/a-plus/settings.py
@@ -148,23 +148,10 @@
 # Testing
 # https://docs.djangoproject.com/en/1.7/topics/testing/advanced/
 
-# Unit test XML-reporting (fix for Python 3)
-# TEST_RUNNER = "test_runner.custom_xml_test_runner.ExcludeAppsXMLTestRunner"
-# TEST_OUTPUT_VERBOSE = True
-# TEST_OUTPUT_DESCRIPTIONS = True
-# TEST_OUTPUT_DIR = "test_results"
-
-TEST_EXCLUDE_APPS = (
-    'django.contrib.contenttypes',
-    'django.contrib.staticfiles',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django_shibboleth',
-    'tastypie',
-    'south',
-)
+TEST_RUNNER = "xmlrunner.extra.djangotestrunner.XMLTestRunner"
+TEST_OUTPUT_VERBOSE = True
+TEST_OUTPUT_DESCRIPTIONS = True
+TEST_OUTPUT_DIR = "test_results"
 
 # Overrides and appends settings defined in local_settings.py
 try:
diff --git a/requirements.txt b/requirements.txt
index 1f912c430..6d0c3fc7c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,19 +1,19 @@
 # This is a requirements file for pip
 Django==1.7.7
 PyYAML==3.10
-amqplib==1.0.2
+#amqplib==1.0.2
 anyjson==0.3.3
 beautifulsoup4==4.3.2
-billiard==2.7.3.17
+#billiard==2.7.3.17
 biplist==0.5
-celery==3.0.11
-django-celery==3.0.11
+#celery==3.0.11
+#django-celery==3.0.11
 django-tastypie==0.12.1
 feedparser==5.1.2
 html5lib==0.99
 httplib2==0.7.6
 icalendar==3.9.0
-kombu==2.4.7
+#kombu==2.4.7
 lxml==3.0.1
 mimeparse==0.1.3
 oauthlib==0.6.2
@@ -23,5 +23,4 @@ pytz==2012f
 six==1.9.0
 south==0.8.2
 unittest-xml-reporting==1.11.0
-#wsgiref==0.1.2
 selenium==2.45.0
diff --git a/test_runner/__init__.py b/test_runner/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test_runner/custom_xml_test_runner.py b/test_runner/custom_xml_test_runner.py
deleted file mode 100644
index 440bbfca6..000000000
--- a/test_runner/custom_xml_test_runner.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from xmlrunner.extra.djangotestrunner import XMLTestRunner
-from django.conf import settings
-
-TEST_EXCLUDE_APPS = getattr(settings, 'TEST_EXCLUDE_APPS', [])
-
-class ExcludeAppsXMLTestRunner(XMLTestRunner):
-
-    def run_tests(self, test_labels, extra_tests=None, **kwargs):
-        if not test_labels:
-            test_labels = [app for app in settings.INSTALLED_APPS if not app in TEST_EXCLUDE_APPS]
-        return super(ExcludeAppsXMLTestRunner, self).run_tests(test_labels, extra_tests, **kwargs)