diff --git a/openedx/core/djangoapps/user_authn/views/login_form.py b/openedx/core/djangoapps/user_authn/views/login_form.py
index 900f9b9038..07aa5cc433 100644
--- a/openedx/core/djangoapps/user_authn/views/login_form.py
+++ b/openedx/core/djangoapps/user_authn/views/login_form.py
@@ -84,12 +84,8 @@ def login_and_registration_form(request, initial_mode="login"):
         except (KeyError, ValueError, IndexError) as ex:
             log.exception("Unknown tpa_hint provider: %s", ex)
 
-    # If this is a themed site, revert to the old login/registration pages.
-    # We need to do this for now to support existing themes.
-    # Themed sites can use the new logistration page by setting
-    # 'ENABLE_COMBINED_LOGIN_REGISTRATION' in their
-    # configuration settings.
-    if is_request_in_themed_site() and not configuration_helpers.get_value('ENABLE_COMBINED_LOGIN_REGISTRATION', False):
+    # We are defaulting to true because all themes should now be using the newer page.
+    if is_request_in_themed_site() and not configuration_helpers.get_value('ENABLE_COMBINED_LOGIN_REGISTRATION', True):
         if initial_mode == "login":
             return old_login_view(request)
         elif initial_mode == "register":
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_views.py b/openedx/core/djangoapps/user_authn/views/tests/test_views.py
index 5f1039c79d..343dc82f84 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_views.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_views.py
@@ -710,27 +710,6 @@ class LoginAndRegistrationTest(ThirdPartyAuthTestMixin, UrlResetMixin, ModuleSto
         self.assertEqual(enterprise_cookie['domain'], settings.BASE_COOKIE_DOMAIN)
         self.assertEqual(enterprise_cookie.value, '')
 
-    @override_settings(SITE_NAME=settings.MICROSITE_TEST_HOSTNAME)
-    def test_microsite_uses_old_login_page(self):
-        # Retrieve the login page from a microsite domain
-        # and verify that we're served the old page.
-        resp = self.client.get(
-            reverse("signin_user"),
-            HTTP_HOST=settings.MICROSITE_TEST_HOSTNAME
-        )
-        self.assertContains(resp, "Log into your Test Site Account")
-        self.assertContains(resp, "login-form")
-
-    def test_microsite_uses_old_register_page(self):
-        # Retrieve the register page from a microsite domain
-        # and verify that we're served the old page.
-        resp = self.client.get(
-            reverse("register_user"),
-            HTTP_HOST=settings.MICROSITE_TEST_HOSTNAME
-        )
-        self.assertContains(resp, "Register for Test Site")
-        self.assertContains(resp, "register-form")
-
     def test_login_registration_xframe_protected(self):
         resp = self.client.get(
             reverse("register_user"),
@@ -843,64 +822,6 @@ class LoginAndRegistrationTest(ThirdPartyAuthTestMixin, UrlResetMixin, ModuleSto
         self.assertEqual(response['Content-Language'], 'es-es')
 
 
-@skip_unless_lms
-@override_settings(SITE_NAME=settings.MICROSITE_LOGISTRATION_HOSTNAME)
-class MicrositeLogistrationTests(TestCase):
-    """
-    Test to validate that microsites can display the logistration page
-    """
-
-    def test_login_page(self):
-        """
-        Make sure that we get the expected logistration page on our specialized
-        microsite
-        """
-
-        resp = self.client.get(
-            reverse('signin_user'),
-            HTTP_HOST=settings.MICROSITE_LOGISTRATION_HOSTNAME
-        )
-        self.assertEqual(resp.status_code, 200)
-
-        self.assertIn('<div id="login-and-registration-container"', resp.content)
-
-    def test_registration_page(self):
-        """
-        Make sure that we get the expected logistration page on our specialized
-        microsite
-        """
-
-        resp = self.client.get(
-            reverse('register_user'),
-            HTTP_HOST=settings.MICROSITE_LOGISTRATION_HOSTNAME
-        )
-        self.assertEqual(resp.status_code, 200)
-
-        self.assertIn('<div id="login-and-registration-container"', resp.content)
-
-    @override_settings(SITE_NAME=settings.MICROSITE_TEST_HOSTNAME)
-    def test_no_override(self):
-        """
-        Make sure we get the old style login/registration if we don't override
-        """
-
-        resp = self.client.get(
-            reverse('signin_user'),
-            HTTP_HOST=settings.MICROSITE_TEST_HOSTNAME
-        )
-        self.assertEqual(resp.status_code, 200)
-
-        self.assertNotIn('<div id="login-and-registration-container"', resp.content)
-
-        resp = self.client.get(
-            reverse('register_user'),
-            HTTP_HOST=settings.MICROSITE_TEST_HOSTNAME
-        )
-        self.assertEqual(resp.status_code, 200)
-
-        self.assertNotIn('<div id="login-and-registration-container"', resp.content)
-
-
 @skip_unless_lms
 class AccountCreationTestCaseWithSiteOverrides(SiteMixin, TestCase):
     """