diff --git a/gracedb/api/urls.py b/gracedb/api/urls.py
index 60e3f4ac204f7d3d5c61f63887cd76afaa586964..14c81ff91cb5a61a7a94c2b251b5a1ce3db55113 100644
--- a/gracedb/api/urls.py
+++ b/gracedb/api/urls.py
@@ -1,9 +1,13 @@
 from django.conf.urls import url, include
 
+from .v1 import urls as v1_urls
+from .v2 import urls as v2_urls
+
 app_name = 'api'
 
+
 urlpatterns = [
-    url(r'^', include('api.v1.urls', namespace='default')),
-    url(r'^v1/', include('api.v1.urls', namespace='v1')),
-    url(r'^v2/', include('api.v2.urls', namespace='v2')),
+    url(r'^', include((v1_urls, 'default'))),
+    url(r'^v1/', include((v1_urls, 'v1'))),
+    url(r'^v2/', include((v2_urls, 'v2'))),
 ]
diff --git a/gracedb/api/utils.py b/gracedb/api/utils.py
index f62d96f7b28b14a3a2b3c56d36fc21b7ea795140..c36cf1e0c4436243c59374026f4d47e6a800bc53 100644
--- a/gracedb/api/utils.py
+++ b/gracedb/api/utils.py
@@ -71,6 +71,7 @@ def is_api_request(request_path):
     api_app_name = 'api'
 
     resolver_match = resolve(request_path)
-    if (resolver_match.app_name == api_app_name):
+    if (resolver_match.app_names and
+        resolver_match.app_names[0] == api_app_name):
         return True
     return False
diff --git a/gracedb/api/v1/superevents/urls.py b/gracedb/api/v1/superevents/urls.py
index a7e18bb38e4c33a3b395ed10547682e2506e9d0c..0ba80993f289d478080f114d4acec322ea2ba9b4 100644
--- a/gracedb/api/v1/superevents/urls.py
+++ b/gracedb/api/v1/superevents/urls.py
@@ -3,6 +3,7 @@ from django.conf.urls import url, include
 from .views import *
 from .settings import SUPEREVENT_LOOKUP_REGEX
 
+
 # URL kwarg for superevent detail and nested pages
 SUPEREVENT_DETAIL_ROOT = '(?P<{lookup_url_kwarg}>{regex})'.format(
     lookup_url_kwarg=SupereventViewSet.lookup_url_kwarg,
diff --git a/gracedb/api/v1/urls.py b/gracedb/api/v1/urls.py
index 26cdfdc52c14e182619216eeca0b40c727513d72..b4d4597b844f95ea997cc093f83411256419d147 100644
--- a/gracedb/api/v1/urls.py
+++ b/gracedb/api/v1/urls.py
@@ -5,6 +5,9 @@ from django.conf.urls import url, include
 from .main.views import GracedbRoot, PerformanceInfo, TagList, UserInfoView, \
     CertDebug, CertInfosDebug
 
+from .events import urls as event_urls
+from .superevents import urls as superevent_urls
+
 
 urlpatterns = [
     # Root level API resources ------------------------------------------------
@@ -26,10 +29,8 @@ urlpatterns = [
     #    name='cert-infos-debug'),
 
     # Events section of the API -----------------------------------------------
-    url(r'^events/', include('api.v1.events.urls',
-        namespace='events')),
+    url(r'^events/', include((event_urls, 'events'))),
 
     # Superevents section of the API ------------------------------------------
-    url(r'^superevents/', include('api.v1.superevents.urls',
-        namespace='superevents')),
+    url(r'^superevents/', include((superevent_urls, 'superevents'))),
 ]