diff --git a/setup.py b/setup.py
index 19e3187e8..fa3b052db 100755
--- a/setup.py
+++ b/setup.py
@@ -137,7 +137,8 @@ if 'setuptools' in sys.modules:
             'ipcontroller = IPython.kernel.scripts.ipcontroller:main',
             'ipengine = IPython.kernel.scripts.ipengine:main',
             'ipcluster = IPython.kernel.scripts.ipcluster:main',
-            'ipythonx = IPython.frontend.wx.ipythonx:main'
+            'ipythonx = IPython.frontend.wx.ipythonx:main',
+            'iptest = IPython.testing.iptest:main',
         ]
     }
     setup_args["extras_require"] = dict(
@@ -152,8 +153,6 @@ if 'setuptools' in sys.modules:
     )
     # Allow setuptools to handle the scripts
     scripts = []
-    # eggs will lack docs, examples
-    data_files = []
 else:
     # package_data of setuptools was introduced to distutils in 2.4
     cfgfiles = filter(isfile, glob('IPython/UserConfig/*'))
diff --git a/setupbase.py b/setupbase.py
index d3db0cdd5..6d387dc4a 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -220,11 +220,12 @@ def find_scripts():
     """
     scripts = ['IPython/kernel/scripts/ipengine',
                'IPython/kernel/scripts/ipcontroller',
-                'IPython/kernel/scripts/ipcluster',
+               'IPython/kernel/scripts/ipcluster',
                'scripts/ipython',
                'scripts/ipythonx',
                'scripts/pycolor',
                'scripts/irunner',
+               'scripts/iptest',
                ]
     
     # Script to be run by the windows binary installer after the default setup