1 files changed, 14 insertions, 3 deletions
diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py
index 16ef1d2b..9b519f27 100644
--- a/rest_framework/runtests/settings.py
+++ b/rest_framework/runtests/settings.py
@@ -100,15 +100,26 @@ INSTALLED_APPS = (
     'rest_framework.tests',
 )
 
+# OAuth is optional and won't work if there is no oauth_provider & oauth2
+try:
+    import oauth_provider
+    import oauth2
+except ImportError:
+    pass
+else:
+    INSTALLED_APPS += (
+        'oauth_provider',
+    )
+
 try:
     import provider
+except ImportError:
+    pass
+else:
     INSTALLED_APPS += (
         'provider',
         'provider.oauth2',
     )
-except ImportError:
-    import logging
-    logging.warning("django-oauth2-provider is not install, some tests will be skipped")
 
 STATIC_URL = '/static/'