diff --git a/Makefile b/Makefile
index 773c680e..4b5e4fe2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,13 @@
-.PHONY: clean-pyc ext-test test upload-docs docs audit
+.PHONY: clean-pyc ext-test test test-with-mem upload-docs docs audit
 
 all: clean-pyc test
 
 test:
 	python run-tests.py
 
+test-with-mem:
+	RUN_FLASK_MEMORY_TESTS=1 python run-tests.py
+
 audit:
 	python setup.py audit
 
diff --git a/flask/testsuite/regression.py b/flask/testsuite/regression.py
index 34fdefc0..00219856 100644
--- a/flask/testsuite/regression.py
+++ b/flask/testsuite/regression.py
@@ -11,12 +11,12 @@
 
 from __future__ import with_statement
 
+import os
 import gc
 import sys
 import flask
 import threading
 import unittest
-from werkzeug.test import run_wsgi_app, create_environ
 from werkzeug.exceptions import NotFound
 from flask.testsuite import FlaskTestCase
 
@@ -112,6 +112,7 @@ class ExceptionTestCase(FlaskTestCase):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(MemoryTestCase))
+    if os.environ.get('RUN_FLASK_MEMORY_TESTS') == '1':
+        suite.addTest(unittest.makeSuite(MemoryTestCase))
     suite.addTest(unittest.makeSuite(ExceptionTestCase))
     return suite