diff --git a/awx/api/urls.py b/awx/api/urls.py
index f3b24c147a..e1fa5165d1 100644
--- a/awx/api/urls.py
+++ b/awx/api/urls.py
@@ -285,7 +285,8 @@ v1_urls = patterns('awx.api.views',
     url(r'^me/$',                   'user_me_list'),
     url(r'^dashboard/$',            'dashboard_view'),
     url(r'^dashboard/graphs/jobs/$','dashboard_jobs_graph_view'),
-    url(r'^settings/',              include(settings_urls)),
+    # TODO: Uncomment aftger 3.0 when we bring database settings endpoints back
+    # url(r'^settings/',              include(settings_urls)),
     url(r'^schedules/',             include(schedule_urls)),
     url(r'^organizations/',         include(organization_urls)),
     url(r'^users/',                 include(user_urls)),
diff --git a/awx/api/views.py b/awx/api/views.py
index 0c406dc610..5daf08ac5c 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -112,7 +112,8 @@ class ApiV1RootView(APIView):
         data['authtoken'] = reverse('api:auth_token_view')
         data['ping'] = reverse('api:api_v1_ping_view')
         data['config'] = reverse('api:api_v1_config_view')
-        data['settings'] = reverse('api:settings_list')
+        # TODO: Uncomment after 3.0 when we bring database settings endpoints back
+        # data['settings'] = reverse('api:settings_list')
         data['me'] = reverse('api:user_me_list')
         data['dashboard'] = reverse('api:dashboard_view')
         data['organizations'] = reverse('api:organization_list')
diff --git a/awx/main/tests/old/settings.py b/awx/main/tests/old/settings.py
index f0d7cf63ac..d2ab4440c5 100644
--- a/awx/main/tests/old/settings.py
+++ b/awx/main/tests/old/settings.py
@@ -46,7 +46,7 @@ TEST_TOWER_SETTINGS_MANIFEST = {
 }
 
 @override_settings(TOWER_SETTINGS_MANIFEST=TEST_TOWER_SETTINGS_MANIFEST)
-class SettingsTest(BaseTest):
+class SettingsPlaceholder(BaseTest):
 
     def setUp(self):
         super(SettingsTest, self).setUp()