diff --git a/.gitignore b/.gitignore
index d30d653..255f396 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,7 +79,7 @@ test/butterfly.txt
 test/model.reg
 test/obs.reg
 test/.coverage
-test/test_python.sh
+test/test_python_ctools.sh
 test/test_python_cscripts.sh
 examples/*.fits
 examples/*.xml
diff --git a/configure.ac b/configure.ac
index 5410657..4b03958 100644
--- a/configure.ac
+++ b/configure.ac
@@ -997,7 +997,7 @@ AC_CONFIG_FILES([Makefile
                  src/ctools-setup
                  test/Makefile
                  test/test_cscripts.sh
-                 test/test_python.sh
+                 test/test_python_ctools.sh
                  test/test_python_cscripts.sh
                  pyext/Makefile
                  pyext/setup.py
@@ -1010,7 +1010,7 @@ AC_CONFIG_FILES([Makefile
                  ctools.pc
                  testconf.sh],
                 [if test -f test/test_cscripts.sh; then chmod +x test/test_cscripts.sh; fi;
-                 if test -f test/test_python.sh; then chmod +x test/test_python.sh; fi;
+                 if test -f test/test_python_ctools.sh; then chmod +x test/test_python_ctools.sh; fi;
                  if test -f test/test_python_cscripts.sh; then chmod +x test/test_python_cscripts.sh; fi;
                  if test -f testconf.sh; then chmod +x testconf.sh; fi])
 AC_OUTPUT
diff --git a/pyext/Makefile.am b/pyext/Makefile.am
index 7be169a..5641980 100755
--- a/pyext/Makefile.am
+++ b/pyext/Makefile.am
@@ -31,7 +31,7 @@ if WITH_PYTHON
 
 # Test scripts to be distributed in $(pyexecdir)/ctools/tests
 testscripts = ctools/tests/__init__.py \
-              ../test/test_python.py \
+              ../test/test_python_ctools.py \
               ../test/test_ctobssim.py \
               ../test/test_ctselect.py \
               ../test/test_ctbin.py \
diff --git a/pyext/ctools/tools.i b/pyext/ctools/tools.i
index cde2403..2cbeaf4 100755
--- a/pyext/ctools/tools.i
+++ b/pyext/ctools/tools.i
@@ -64,6 +64,6 @@
 /* __ Test function ______________________________________________________ */
 %pythoncode %{
 def test():
-    from ctools.tests import test_python
-    test_python.test(installed=True)
+    from ctools.tests import test_python_ctools
+    test_python_ctools.test(installed=True)
 %}
\ No newline at end of file
diff --git a/test/Makefile.am b/test/Makefile.am
index ab2215a..da21504 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -7,7 +7,7 @@ MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
 # Optional python bindings
 if WITH_PYTHON
   TEST_CSCRIPTS        = test_cscripts.sh
-  TEST_PYTHON_CTOOLS   = test_python.sh
+  TEST_PYTHON_CTOOLS   = test_python_ctools.sh
   TEST_PYTHON_CSCRIPTS = test_python_cscripts.sh
   TEST_PYTHON_ENV      = PYTHONPATH=$(top_builddir):$(top_builddir)/pyext:$(top_builddir)/pyext/build/ctools/ctools:$(pythondir):$(pyexecdir):$(PYTHONPATH)
 endif
diff --git a/test/test_python.py b/test/test_python_ctools.py
index 3d4aacd..3d4aacd 100755
--- a/test/test_python.py
+++ b/test/test_python_ctools.py
diff --git a/test/test_python.sh.in b/test/test_python_ctools.sh.in
index 9165ce5..ed7cf0b 100755
--- a/test/test_python.sh.in
+++ b/test/test_python_ctools.sh.in
@@ -22,4 +22,4 @@
 #
 # Run the Python test
 # ===================
-@PYTHON_COVERAGE@./test_python.py
+@PYTHON_COVERAGE@./test_python_ctools.py