diff --git a/test/test_apps.py b/test/test_apps.py
index 12b59e18afc1ae956d6b7a4817e908a8bd89e7dc..0ed3162f1360f3d6613575d7ea335ae2ccd0a95d 100644
--- a/test/test_apps.py
+++ b/test/test_apps.py
@@ -671,7 +671,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: foldmethod=marker
diff --git a/test/test_c_execution.py b/test/test_c_execution.py
index 975227b435b2c0738031b5eba8308fc3efbf8fb9..01a2cb94f1434fd838c582a20be72ae88bfdf371 100644
--- a/test/test_c_execution.py
+++ b/test/test_c_execution.py
@@ -347,7 +347,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: foldmethod=marker
diff --git a/test/test_dg.py b/test/test_dg.py
index e96c76d88b0ab497c7ccdc7df94880a894607bc3..c8623f78d3ae6220c0e06eb240a4a527b9c48d34 100644
--- a/test/test_dg.py
+++ b/test/test_dg.py
@@ -246,5 +246,5 @@ 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__])
diff --git a/test/test_diff.py b/test/test_diff.py
index 3d19721ac030ceccf819f4135b4e734594384e53..054d81f52f4931d8d401667a3eab3e963ce1c458 100644
--- a/test/test_diff.py
+++ b/test/test_diff.py
@@ -106,7 +106,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: foldmethod=marker
diff --git a/test/test_domain.py b/test/test_domain.py
index 680ff299292e928c6286a168c3e71a23c60aac9b..20614d510134e2938624a367148d0fe8ade93b1e 100644
--- a/test/test_domain.py
+++ b/test/test_domain.py
@@ -406,7 +406,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: foldmethod=marker
diff --git a/test/test_fortran.py b/test/test_fortran.py
index ea2f68b617e4af41210dc05988a3eebb7f0e49a6..a876e2b49504122d3e8a9cadffec745d8b452030 100644
--- a/test/test_fortran.py
+++ b/test/test_fortran.py
@@ -498,7 +498,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: foldmethod=marker
diff --git a/test/test_isl.py b/test/test_isl.py
index f793b1fa99f8768ff4e2fcfaa02aa87119ffcc92..bbd4a813ea12884fede753f428267038cc9b435a 100644
--- a/test/test_isl.py
+++ b/test/test_isl.py
@@ -56,5 +56,5 @@ 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__])
diff --git a/test/test_linalg.py b/test/test_linalg.py
index accdebc1237c70f4227adc5bfcba6fa9cf88d190..7db6c390f074fc6940f1b6a121cdd3d75bd3002d 100644
--- a/test/test_linalg.py
+++ b/test/test_linalg.py
@@ -643,5 +643,5 @@ 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__])
diff --git a/test/test_loopy.py b/test/test_loopy.py
index 86351dd9340796a4511b2d422b1b86cf181786f2..ef1f491d2a5e4d3fb724a69bd9c833adb6f74dcb 100644
--- a/test/test_loopy.py
+++ b/test/test_loopy.py
@@ -2873,7 +2873,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: foldmethod=marker
diff --git a/test/test_misc.py b/test/test_misc.py
index ec14770a912af978fbc6651110529a86b307df83..c67c664055eae5a50f3487227c46331d6b4708a9 100644
--- a/test/test_misc.py
+++ b/test/test_misc.py
@@ -291,7 +291,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: foldmethod=marker
diff --git a/test/test_nbody.py b/test/test_nbody.py
index f2a8fc1981ddc2066ff52a2b712df95b5d36ccd2..d1a708f723794eacd4807e159cfe23b59cacaa59 100644
--- a/test/test_nbody.py
+++ b/test/test_nbody.py
@@ -102,5 +102,5 @@ 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__])
diff --git a/test/test_numa_diff.py b/test/test_numa_diff.py
index 216f7f637eb06ad9dbeff76d958a04869c8e3457..7479b849b3149b0b7095f1328ad5576d6f39fbde 100644
--- a/test/test_numa_diff.py
+++ b/test/test_numa_diff.py
@@ -258,7 +258,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: foldmethod=marker
diff --git a/test/test_reduction.py b/test/test_reduction.py
index 6b62bad5b50952a3d29beec49cfce4369d5a4acf..866ae9f588cb149312307e771fffc9010ea1ead8 100644
--- a/test/test_reduction.py
+++ b/test/test_reduction.py
@@ -442,7 +442,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: foldmethod=marker
diff --git a/test/test_scan.py b/test/test_scan.py
index 44903611d27e14e502c0c8459be9378dbc77a9a4..c45afd0d6ecad2ddf0d07a358ad2a55620f9d1d0 100644
--- a/test/test_scan.py
+++ b/test/test_scan.py
@@ -429,7 +429,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: foldmethod=marker
diff --git a/test/test_sem_reagan.py b/test/test_sem_reagan.py
index ecb2352ae277bd0677af09801d7bf24ee30da6b9..450ddeba9bafe3c522a75df6d766a041ec6dd956 100644
--- a/test/test_sem_reagan.py
+++ b/test/test_sem_reagan.py
@@ -115,5 +115,5 @@ 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__])
diff --git a/test/test_statistics.py b/test/test_statistics.py
index c04257ff86bd0e726cce2f1481c55cec0c8275e1..ea0bdb62bb75d8a5bcf7dd987c00c33b848091fd 100644
--- a/test/test_statistics.py
+++ b/test/test_statistics.py
@@ -1095,5 +1095,5 @@ 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__])
diff --git a/test/test_target.py b/test/test_target.py
index 15964987ab3d83d31c91ea266f29698a695c74a6..89d72c0ac53d69a0b925f9ac448875886dd0f318 100644
--- a/test/test_target.py
+++ b/test/test_target.py
@@ -331,7 +331,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: foldmethod=marker
diff --git a/test/test_transform.py b/test/test_transform.py
index e1a58e30286141b4d0592debcd308552f32ff632..2f98fe34d20bdd07a0af40ae18402aa26b1165d5 100644
--- a/test/test_transform.py
+++ b/test/test_transform.py
@@ -537,7 +537,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: foldmethod=marker