diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py
index 810e26dbb..4de6997cf 100644
--- a/ietf/doc/tests_draft.py
+++ b/ietf/doc/tests_draft.py
@@ -916,7 +916,7 @@ class IndividualInfoFormsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('.content-wrapper a:contains("Edit")')), 1)
+        self.assertEqual(len(q('#content a:contains("Edit")')), 1)
 
         # Try again when no longer a shepherd.
 
@@ -925,7 +925,7 @@ class IndividualInfoFormsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('.content-wrapper a:contains("Edit")')), 0)
+        self.assertEqual(len(q('#content a:contains("Edit")')), 0)
 
     def test_doc_change_shepherd_writeup(self):
         url = urlreverse('doc_edit_shepherd_writeup',kwargs=dict(name=self.docname))
diff --git a/ietf/doc/tests_status_change.py b/ietf/doc/tests_status_change.py
index 9376d02fc..b22cd9f31 100644
--- a/ietf/doc/tests_status_change.py
+++ b/ietf/doc/tests_status_change.py
@@ -345,9 +345,9 @@ class StatusChangeTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('.content-wrapper [type=submit]:contains("Save")')),1)
+        self.assertEqual(len(q('#content [type=submit]:contains("Save")')),1)
         # There should be three rows on the form
-        self.assertEqual(len(q('.content-wrapper .row')),3)
+        self.assertEqual(len(q('#content .row')),3)
 
         # Try to add a relation to an RFC that doesn't exist
         r = self.client.post(url,dict(new_relation_row_blah="rfc9997",
diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py
index d611fcced..912c302bd 100644
--- a/ietf/group/tests_info.py
+++ b/ietf/group/tests_info.py
@@ -100,7 +100,7 @@ class GroupPagesTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('.content-wrapper a:contains("%s")' % group.acronym)), 1)
+        self.assertEqual(len(q('#content a:contains("%s")' % group.acronym)), 1)
 
     def test_concluded_groups(self):
         draft = make_test_data()
@@ -112,7 +112,7 @@ class GroupPagesTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('.content-wrapper a:contains("%s")' % group.acronym)), 1)
+        self.assertEqual(len(q('#content a:contains("%s")' % group.acronym)), 1)
 
     def test_bofs(self):
         draft = make_test_data()
@@ -124,7 +124,7 @@ class GroupPagesTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('.content-wrapper a:contains("%s")' % group.acronym)), 1)
+        self.assertEqual(len(q('#content a:contains("%s")' % group.acronym)), 1)
         
     def test_group_documents(self):
         draft = make_test_data()
diff --git a/ietf/mailinglists/tests.py b/ietf/mailinglists/tests.py
index 94ea66729..485494b7a 100644
--- a/ietf/mailinglists/tests.py
+++ b/ietf/mailinglists/tests.py
@@ -18,13 +18,13 @@ class MailingListTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q(".content-wrapper a:contains(\"%s\")" % group.acronym)), 0)
+        self.assertEqual(len(q("#content a:contains(\"%s\")" % group.acronym)), 0)
 
         # successful get
         group.list_archive = "https://example.com/foo"
         group.save()
         r = self.client.get(url)
         q = PyQuery(r.content)
-        self.assertEqual(len(q(".content-wrapper a:contains(\"%s\")" % group.acronym)), 1)
+        self.assertEqual(len(q("#content a:contains(\"%s\")" % group.acronym)), 1)
 
 
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
index cd7587c25..260c8101c 100644
--- a/ietf/meeting/tests_views.py
+++ b/ietf/meeting/tests_views.py
@@ -44,7 +44,7 @@ class MeetingTests(TestCase):
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number)))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        agenda_content = q(".content-wrapper").html()
+        agenda_content = q("#content").html()
         self.assertTrue(session.group.acronym in agenda_content)
         self.assertTrue(session.group.name in agenda_content)
         self.assertTrue(session.group.parent.acronym.upper() in agenda_content)
@@ -119,7 +119,7 @@ class MeetingTests(TestCase):
         r = self.client.get(urlreverse("ietf.meeting.views.materials", kwargs=dict(meeting_num=meeting.number)))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        row = q('.content-wrapper td:contains("%s")' % str(session.group.acronym)).closest("tr")
+        row = q('#content td:contains("%s")' % str(session.group.acronym)).closest("tr")
         self.assertTrue(row.find('a:contains("Agenda")'))
         self.assertTrue(row.find('a:contains("Minutes")'))
         self.assertTrue(row.find('a:contains("Slideshow")'))