diff --git a/test/bottleneck/test.py b/test/bottleneck_test/test.py
similarity index 100%
rename from test/bottleneck/test.py
rename to test/bottleneck_test/test.py
diff --git a/test/bottleneck/test_args.py b/test/bottleneck_test/test_args.py
similarity index 100%
rename from test/bottleneck/test_args.py
rename to test/bottleneck_test/test_args.py
diff --git a/test/bottleneck/test_cuda.py b/test/bottleneck_test/test_cuda.py
similarity index 100%
rename from test/bottleneck/test_cuda.py
rename to test/bottleneck_test/test_cuda.py
diff --git a/test/test_utils.py b/test/test_utils.py
index b10c1f721b12..8f0545d68e04 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -356,11 +356,11 @@ def _run_bottleneck(self, test_file, scriptargs=''):
 
     def _check_run_args(self):
         # Check that this fails due to missing args
-        rc, out, err = self._run_bottleneck('bottleneck/test_args.py')
+        rc, out, err = self._run_bottleneck('bottleneck_test/test_args.py')
         self.assertEqual(rc, 2, None, self._fail_msg('Missing args should error', out + err))
 
         # This should succeed
-        rc, out, err = self._run_bottleneck('bottleneck/test_args.py', '--foo foo --bar bar')
+        rc, out, err = self._run_bottleneck('bottleneck_test/test_args.py', '--foo foo --bar bar')
         self.assertEqual(rc, 0, None, self._fail_msg('Should pass args to script', out + err))
 
     def _fail_msg(self, msg, output):
@@ -404,7 +404,7 @@ def _check_cuda(self, output):
 
     @unittest.skipIf(HAS_CUDA, 'CPU-only test')
     def test_bottleneck_cpu_only(self):
-        rc, out, err = self._run_bottleneck('bottleneck/test.py')
+        rc, out, err = self._run_bottleneck('bottleneck_test/test.py')
         self.assertEqual(rc, 0, 'Run failed with\n{}'.format(err))
 
         self._check_run_args()
@@ -416,7 +416,7 @@ def test_bottleneck_cpu_only(self):
     @unittest.skipIf(not HAS_CUDA, 'No CUDA')
     @skipIfRocm
     def test_bottleneck_cuda(self):
-        rc, out, err = self._run_bottleneck('bottleneck/test_cuda.py')
+        rc, out, err = self._run_bottleneck('bottleneck_test/test_cuda.py')
         self.assertEqual(rc, 0, 'Run failed with\n{}'.format(err))
 
         self._check_run_args()