Merge branch 'master' into force-tuple

1 files changed, 2 insertions, 6 deletions

diff --git a/numpy/lib/tests/test_regression.py b/numpy/lib/tests/test_regression.py
index d96d3422d..4c46bc46b 100644
--- a/numpy/lib/tests/test_regression.py
+++ b/numpy/lib/tests/test_regression.py
@@ -5,8 +5,8 @@ import sys
 
 import numpy as np
 from numpy.testing import (
-    run_module_suite, assert_, assert_equal, assert_array_equal,
-    assert_array_almost_equal, assert_raises, _assert_valid_refcount,
+    assert_, assert_equal, assert_array_equal, assert_array_almost_equal,
+    assert_raises, _assert_valid_refcount,
     )
 from numpy.compat import unicode
 
@@ -252,7 +252,3 @@ class TestRegression(object):
             raise AssertionError()
         finally:
             out.close()
-
-
-if __name__ == "__main__":
-    run_module_suite()