diff --git a/CMakeLists.txt b/CMakeLists.txt
index 474c6d4c..c5249bc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,15 +107,19 @@ if( EXIV2_BUILD_SAMPLES )
     if (Python3_Interpreter_FOUND)
         add_test(NAME bashTests
             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
-            COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py bash_tests/testcases.py --verbose
+            COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bash_tests
         )
-        add_test(NAME versionTests
+        add_test(NAME bugfixes
             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
-            COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py bash_tests/version_test.py
+            COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bugfixes
         )
-        add_test(NAME pythonTests
+        add_test(NAME tiffTests
             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
-            COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py
+            COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose tiff_test
+        )
+        add_test(NAME lensTests
+            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
+            COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose lens_tests
         )
     endif()
 endif()
diff --git a/tests/bash_tests/unit_test.py b/tests/bash_tests/unit_test.py
deleted file mode 100644
index 844bbe7c..00000000
--- a/tests/bash_tests/unit_test.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import system_tests
-import os
-import unittest
-
-bSkip=not (os.path.isfile(system_tests.unit_tests) or os.path.isfile(system_tests.unit_tests + '.exe'))
-if bSkip:
-    msg='*** %s does not exist ***' % system_tests.unit_tests
-    print(msg)
-    raise unittest.SkipTest(msg)
-
-system_tests.BT.runTest(system_tests.unit_tests,raw=True)
-print('')
diff --git a/tests/bash_tests/version_test.py b/tests/bash_tests/version_test.py
deleted file mode 100644
index 62cf67f4..00000000
--- a/tests/bash_tests/version_test.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import system_tests
-system_tests.BT.verbose_version(True)