diff --git a/test/test_algorithm.py b/test/test_algorithm.py
index 9bd15f862f5edcd08f900c03b418c55ac656da86..b7b296ce959f2f9d92c290196e0a8f28b6043dc7 100644
--- a/test/test_algorithm.py
+++ b/test/test_algorithm.py
@@ -1031,7 +1031,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: filetype=pyopencl:fdm=marker
diff --git a/test/test_array.py b/test/test_array.py
index a9c1717014a46b2be41775831a438a74c99a7a7a..bca78f5ccbeebf1d86f9ec03a25ded6050bc4097 100644
--- a/test/test_array.py
+++ b/test/test_array.py
@@ -1219,7 +1219,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: filetype=pyopencl:fdm=marker
diff --git a/test/test_clmath.py b/test/test_clmath.py
index aaa89daf18740ca09d6d999652a7bad641edf29a..553ed7a6f6ad4f93abde9e46b0bc5fb60a9066f0 100644
--- a/test/test_clmath.py
+++ b/test/test_clmath.py
@@ -452,5 +452,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_enqueue_copy.py b/test/test_enqueue_copy.py
index 564e833a4bc167644bd057c5fa2117d17bda2cda..bfbf4f16edd757c3bf8e8bc59fb2d2ed311c0d29 100644
--- a/test/test_enqueue_copy.py
+++ b/test/test_enqueue_copy.py
@@ -218,5 +218,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_wrapper.py b/test/test_wrapper.py
index 2bf41bc73c28ce8e868a546088057fb8517b70e8..9091c9cd6a3371db8801d564294bd1560766fc87 100644
--- a/test/test_wrapper.py
+++ b/test/test_wrapper.py
@@ -1066,5 +1066,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__])