diff --git a/test/test_codegen.py b/test/test_codegen.py
index 0a02b6b4c39d9223380555bb705b9227ed1caf17..7e3c25e0e5f029ef5161ba970106283e01ef245f 100644
--- a/test/test_codegen.py
+++ b/test/test_codegen.py
@@ -112,7 +112,7 @@ if __name__ == "__main__":
     if len(sys.argv) > 1:
         exec(sys.argv[1])
     else:
-        from py.test.cmdline import main
+        from pytest import main
         main([__file__])
 
 # vim: fdm=marker
diff --git a/test/test_cse.py b/test/test_cse.py
index 5f10115cea88a041063b4ef48b4a13a4072ce34f..d6a2c0f05cb1c4512fa3a8b26b6a2654a7ed1ea3 100644
--- a/test/test_cse.py
+++ b/test/test_cse.py
@@ -379,7 +379,7 @@ if __name__ == "__main__":
     if len(sys.argv) > 1:
         exec(sys.argv[1])
     else:
-        from py.test.cmdline import main
+        from pytest import main
         main([__file__])
 
 # vim: fdm=marker
diff --git a/test/test_fmm.py b/test/test_fmm.py
index bd1fe84869a2e34e707b601f8903bfa6ff01d1d1..0331db6c696043b2efb8fe27286a2d48cbd16b59 100644
--- a/test/test_fmm.py
+++ b/test/test_fmm.py
@@ -311,7 +311,7 @@ if __name__ == "__main__":
     if len(sys.argv) > 1:
         exec(sys.argv[1])
     else:
-        from py.test.cmdline import main
+        from pytest import main
         main([__file__])
 
 # vim: fdm=marker
diff --git a/test/test_kernels.py b/test/test_kernels.py
index 65295e29451e039619ef65076926cc1b5b182d22..3fcb195bba0be9cb0b67a4822a45dec616d370aa 100644
--- a/test/test_kernels.py
+++ b/test/test_kernels.py
@@ -618,7 +618,7 @@ if __name__ == "__main__":
     if len(sys.argv) > 1:
         exec(sys.argv[1])
     else:
-        from py.test.cmdline import main
+        from pytest import main
         main([__file__])
 
 # vim: fdm=marker
diff --git a/test/test_matrixgen.py b/test/test_matrixgen.py
index 244a555b30e8be3a10c0bf635f936d89f3ebdce7..c7785d042b1ea2a6ee189d682722a679efad3021 100644
--- a/test/test_matrixgen.py
+++ b/test/test_matrixgen.py
@@ -147,7 +147,7 @@ if __name__ == "__main__":
     if len(sys.argv) > 1:
         exec(sys.argv[1])
     else:
-        from py.test.cmdline import main
+        from pytest import main
         main([__file__])
 
 # vim: fdm=marker
diff --git a/test/test_misc.py b/test/test_misc.py
index 97feecd2e2fa7cbadc814bcea0f779264daaa33b..7b35b2ddc3743d0eb9b7e80daf38c617ea73940d 100644
--- a/test/test_misc.py
+++ b/test/test_misc.py
@@ -142,7 +142,7 @@ if __name__ == "__main__":
     if len(sys.argv) > 1:
         exec(sys.argv[1])
     else:
-        from py.test.cmdline import main
+        from pytest import main
         main([__file__])
 
 # vim: fdm=marker
diff --git a/test/test_qbx.py b/test/test_qbx.py
index 3758a5d7b5af4f031dabc9770da884860c585382..d408c4a4b82b907a6af801227f2c0e3ffbbb2f5a 100644
--- a/test/test_qbx.py
+++ b/test/test_qbx.py
@@ -103,7 +103,7 @@ if __name__ == "__main__":
     if len(sys.argv) > 1:
         exec(sys.argv[1])
     else:
-        from py.test.cmdline import main
+        from pytest import main
         main([__file__])
 
 # vim: fdm=marker