diff --git a/openedx/features/course_experience/tests/views/test_course_home.py b/openedx/features/course_experience/tests/views/test_course_home.py
index 3094022d45..859c3fef58 100644
--- a/openedx/features/course_experience/tests/views/test_course_home.py
+++ b/openedx/features/course_experience/tests/views/test_course_home.py
@@ -65,7 +65,7 @@ class TestCourseHomePage(SharedModuleStoreTestCase):
         get_course_in_cache(self.course.id)
 
         # Fetch the view and verify the query counts
-        with self.assertNumQueries(36):
+        with self.assertNumQueries(35):
             with check_mongo_calls(3):
                 url = course_home_url(self.course)
                 self.client.get(url)
diff --git a/openedx/features/course_experience/tests/views/test_course_outline.py b/openedx/features/course_experience/tests/views/test_course_outline.py
index 5acc410855..560327400e 100644
--- a/openedx/features/course_experience/tests/views/test_course_outline.py
+++ b/openedx/features/course_experience/tests/views/test_course_outline.py
@@ -4,6 +4,7 @@ Tests for the Course Outline view and supporting views.
 import datetime
 import ddt
 import json
+from markupsafe import escape
 
 from django.core.urlresolvers import reverse
 from pyquery import PyQuery as pq
@@ -243,4 +244,4 @@ class TestEmptyCourseOutlinePage(SharedModuleStoreTestCase):
         url = course_home_url(course)
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, expected_text)
+        self.assertContains(response, escape(expected_text))
diff --git a/openedx/features/course_experience/tests/views/test_course_updates.py b/openedx/features/course_experience/tests/views/test_course_updates.py
index 4afcca0956..2459f7c07a 100644
--- a/openedx/features/course_experience/tests/views/test_course_updates.py
+++ b/openedx/features/course_experience/tests/views/test_course_updates.py
@@ -84,7 +84,7 @@ class TestCourseUpdatesPage(SharedModuleStoreTestCase):
 
     def test_queries(self):
         # Fetch the view and verify that the query counts haven't changed
-        with self.assertNumQueries(34):
+        with self.assertNumQueries(32):
             with check_mongo_calls(4):
                 url = course_updates_url(self.course)
                 self.client.get(url)
diff --git a/pavelib/utils/test/suites/nose_suite.py b/pavelib/utils/test/suites/nose_suite.py
index 6d21d70282..fce208367b 100644
--- a/pavelib/utils/test/suites/nose_suite.py
+++ b/pavelib/utils/test/suites/nose_suite.py
@@ -191,7 +191,7 @@ class SystemTestSuite(NoseTestSuite):
         if self.root == 'lms':
             default_test_id += " {system}/tests.py"
             default_test_id += " openedx/core/djangolib/*"
-            default_test_id += " openedx/features/*"
+            default_test_id += " openedx/features"
 
         return default_test_id.format(system=self.root)