12 files changed, 28 insertions, 3 deletions
diff --git a/numpy/testing/__init__.py b/numpy/testing/__init__.py
index f391c8053..19b0d2052 100644
--- a/numpy/testing/__init__.py
+++ b/numpy/testing/__init__.py
@@ -3,7 +3,9 @@
 This single module should provide all the common functionality for numpy tests
 in a single location, so that test scripts can just import it and work right
 away.
+
 """
+from __future__ import division
 
 from unittest import TestCase
 
diff --git a/numpy/testing/decorators.py b/numpy/testing/decorators.py
index ed7b1032b..eae9d93b0 100644
--- a/numpy/testing/decorators.py
+++ b/numpy/testing/decorators.py
@@ -13,6 +13,8 @@ function name, setup and teardown functions and so on - see
 ``nose.tools`` for more information.
 
 """
+from __future__ import division
+
 import warnings
 import sys
 
diff --git a/numpy/testing/noseclasses.py b/numpy/testing/noseclasses.py
index 6df3d1cb0..96c779c2e 100644
--- a/numpy/testing/noseclasses.py
+++ b/numpy/testing/noseclasses.py
@@ -4,6 +4,7 @@
 # Because this module imports nose directly, it should not
 # be used except by nosetester.py to avoid a general NumPy
 # dependency on nose.
+from __future__ import division
 
 import os
 import doctest
diff --git a/numpy/testing/nosetester.py b/numpy/testing/nosetester.py
index 09418bb87..7f1292cd8 100644
--- a/numpy/testing/nosetester.py
+++ b/numpy/testing/nosetester.py
@@ -4,6 +4,8 @@ Nose test running.
 This module implements ``test()`` and ``bench()`` functions for NumPy modules.
 
 """
+from __future__ import division
+
 import os
 import sys
 import warnings
diff --git a/numpy/testing/nulltester.py b/numpy/testing/nulltester.py
index 8cee43495..e0c7531b3 100644
--- a/numpy/testing/nulltester.py
+++ b/numpy/testing/nulltester.py
@@ -1,11 +1,13 @@
-''' Null tester to signal nose tests disabled
+""" Null tester to signal nose tests disabled
 
 Merely returns error reporting lack of nose package or version number
 below requirements.
 
 See pkgtester, nosetester modules
 
-'''
+"""
+from __future__ import division
+
 
 class NullTester(object):
     def test(self, labels=None, *args, **kwargs):
diff --git a/numpy/testing/numpytest.py b/numpy/testing/numpytest.py
index 200c88b03..5259ba773 100644
--- a/numpy/testing/numpytest.py
+++ b/numpy/testing/numpytest.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import os
 import sys
 import traceback
diff --git a/numpy/testing/print_coercion_tables.py b/numpy/testing/print_coercion_tables.py
index d87544987..4982f5602 100755
--- a/numpy/testing/print_coercion_tables.py
+++ b/numpy/testing/print_coercion_tables.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
-"""Prints type-coercion tables for the built-in NumPy types"""
+"""Prints type-coercion tables for the built-in NumPy types
+
+"""
+from __future__ import division
 
 import numpy as np
 
diff --git a/numpy/testing/setup.py b/numpy/testing/setup.py
index 6d8fc85c5..c72dd1d9a 100755
--- a/numpy/testing/setup.py
+++ b/numpy/testing/setup.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import division
+
 
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
diff --git a/numpy/testing/tests/test_decorators.py b/numpy/testing/tests/test_decorators.py
index a28e24ac3..e2dc2bd7d 100644
--- a/numpy/testing/tests/test_decorators.py
+++ b/numpy/testing/tests/test_decorators.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import numpy as np
 from numpy.testing import *
 from numpy.testing.noseclasses import KnownFailureTest
diff --git a/numpy/testing/tests/test_doctesting.py b/numpy/testing/tests/test_doctesting.py
index a34071128..58f65aa45 100644
--- a/numpy/testing/tests/test_doctesting.py
+++ b/numpy/testing/tests/test_doctesting.py
@@ -1,5 +1,8 @@
 """ Doctests for NumPy-specific nose/doctest modifications
+
 """
+from __future__ import division
+
 # try the #random directive on the output line
 def check_random_directive():
     '''
diff --git a/numpy/testing/tests/test_utils.py b/numpy/testing/tests/test_utils.py
index 23b2f8e7b..9722c583c 100644
--- a/numpy/testing/tests/test_utils.py
+++ b/numpy/testing/tests/test_utils.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import warnings
 import sys
 
diff --git a/numpy/testing/utils.py b/numpy/testing/utils.py
index 1918c9dcf..019adeb27 100644
--- a/numpy/testing/utils.py
+++ b/numpy/testing/utils.py
@@ -1,6 +1,8 @@
 """
 Utility function to facilitate testing.
+
 """
+from __future__ import division
 
 import os
 import sys