diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2158f77..8f65859a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,25 +110,28 @@ if( EXIV2_BUILD_SAMPLES )
             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
             COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bash_tests
         )
-        add_test(NAME bugfixTests
-            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
-            COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bugfixes
-        )
-        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
-        )
-        add_test(NAME tiffTests
-            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
-            COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose tiff_test
-        )
-        add_test(NAME versionTests
-            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
-            COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bash_tests/version_test.py 
-        )
     endif()
 endif()
 
+if (Python3_Interpreter_FOUND)
+    add_test(NAME bugfixTests
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
+        COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bugfixes
+    )
+    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
+    )
+    add_test(NAME tiffTests
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
+        COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose tiff_test
+    )
+    add_test(NAME versionTests
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
+        COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bash_tests/version_test.py 
+    )
+endif()
+
 if( EXIV2_ENABLE_NLS )
     add_subdirectory( po )
 endif()
diff --git a/tests/bugfixes/redmine/test_easyaccess.py b/tests/bash_tests/test_easyaccess.py
similarity index 98%
rename from tests/bugfixes/redmine/test_easyaccess.py
rename to tests/bash_tests/test_easyaccess.py
index ae34bb8d..cd6d1623 100644
--- a/tests/bugfixes/redmine/test_easyaccess.py
+++ b/tests/bash_tests/test_easyaccess.py
@@ -6,6 +6,8 @@ import system_tests
 @system_tests.CopyFiles("$data_path/exiv2-empty.jpg")
 class EasyaccessTest(metaclass=system_tests.CaseMeta):
 
+    url = "https://github.com/Exiv2/exiv2/pull/287"
+
     filename = "$data_path/exiv2-empty_copy.jpg"
 
     commands = [
diff --git a/tests/bugfixes/github/test_exifprint_lint.py b/tests/bash_tests/test_exifprint_lint.py
similarity index 100%
rename from tests/bugfixes/github/test_exifprint_lint.py
rename to tests/bash_tests/test_exifprint_lint.py
diff --git a/tests/bugfixes/redmine/test_issue_1054.py b/tests/bash_tests/test_issue_1054.py
similarity index 100%
rename from tests/bugfixes/redmine/test_issue_1054.py
rename to tests/bash_tests/test_issue_1054.py
diff --git a/tests/bugfixes/github/test_issue_1504.py b/tests/bash_tests/test_issue_1504.py
similarity index 100%
rename from tests/bugfixes/github/test_issue_1504.py
rename to tests/bash_tests/test_issue_1504.py
diff --git a/tests/bugfixes/redmine/test_issue_480.py b/tests/bash_tests/test_issue_480.py
similarity index 100%
rename from tests/bugfixes/redmine/test_issue_480.py
rename to tests/bash_tests/test_issue_480.py
diff --git a/tests/bugfixes/github/test_issue_984.py b/tests/bash_tests/test_issue_984.py
similarity index 100%
rename from tests/bugfixes/github/test_issue_984.py
rename to tests/bash_tests/test_issue_984.py
diff --git a/tests/bugfixes/github/test_pr_1905.py b/tests/bash_tests/test_pr_1905.py
similarity index 95%
rename from tests/bugfixes/github/test_pr_1905.py
rename to tests/bash_tests/test_pr_1905.py
index 5322cc88..9cf6091d 100644
--- a/tests/bugfixes/github/test_pr_1905.py
+++ b/tests/bash_tests/test_pr_1905.py
@@ -6,6 +6,7 @@ class TestExifTagsInTaglist(metaclass=CaseMeta):
 
 # The taglist program outputs lots of data on all Exif tags.
 # Extract only the keys and compare
+    url = "https://github.com/Exiv2/exiv2/pull/1905/files"
     filename = "$tmp_path/TestExifTagsInTaglist.txt"
     commands = ["$taglist Exif > $filename",
                 "cut -d, -f5 $filename"]
diff --git a/tests/tiff_test/test_tiff_test_program.py b/tests/bash_tests/test_tiff_test_program.py
similarity index 100%
rename from tests/tiff_test/test_tiff_test_program.py
rename to tests/bash_tests/test_tiff_test_program.py