diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index de4ae9cf0..3089b63cd 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -65,7 +65,7 @@ def _show_toolbar(self, request):
         if not remote_addr in settings.INTERNAL_IPS \
             or (request.is_ajax() and \
                 not debug_toolbar.urls._PREFIX in request.path) \
-                    or not (settings.DEBUG or getattr(settings, 'TEST', False)):
+                    or not (settings.DEBUG and not getattr(settings, 'TEST', False)):
             return False
         return True