diff --git a/run_unittests.py b/run_unittests.py
index 21eabde3e..6d7eba213 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -5014,7 +5014,7 @@ recommended as it is not supported on some platforms''')
     def test_wrap_git(self):
         with tempfile.TemporaryDirectory() as tmpdir:
             srcdir = os.path.join(tmpdir, 'src')
-            shutil.copytree(os.path.join(self.unit_test_dir, '78 wrap-git'), srcdir)
+            shutil.copytree(os.path.join(self.unit_test_dir, '81 wrap-git'), srcdir)
             upstream = os.path.join(srcdir, 'subprojects', 'wrap_git_upstream')
             upstream_uri = Path(upstream).as_uri()
             _git_init(upstream)
@@ -6473,7 +6473,7 @@ class LinuxlikeTests(BasePlatformTests):
         if is_osx():
             raise unittest.SkipTest('Global RPATHs via LDFLAGS not yet supported on MacOS (does anybody need it?)')
 
-        testdir = os.path.join(self.unit_test_dir, '77 global-rpath')
+        testdir = os.path.join(self.unit_test_dir, '80 global-rpath')
         oldinstalldir = self.installdir
 
         # Build and install an external library without DESTDIR.
@@ -6846,7 +6846,7 @@ class LinuxlikeTests(BasePlatformTests):
         oldinstalldir = self.installdir
 
         # Build and install both external libraries without DESTDIR
-        val1dir = os.path.join(self.unit_test_dir, '76 pkgconfig prefixes', 'val1')
+        val1dir = os.path.join(self.unit_test_dir, '77 pkgconfig prefixes', 'val1')
         val1prefix = os.path.join(oldinstalldir, 'val1')
         self.prefix = val1prefix
         self.installdir = val1prefix
@@ -6857,7 +6857,7 @@ class LinuxlikeTests(BasePlatformTests):
 
         env1 = {}
         env1['PKG_CONFIG_PATH'] = os.path.join(val1prefix, self.libdir, 'pkgconfig')
-        val2dir = os.path.join(self.unit_test_dir, '76 pkgconfig prefixes', 'val2')
+        val2dir = os.path.join(self.unit_test_dir, '77 pkgconfig prefixes', 'val2')
         val2prefix = os.path.join(oldinstalldir, 'val2')
         self.prefix = val2prefix
         self.installdir = val2prefix
@@ -6869,7 +6869,7 @@ class LinuxlikeTests(BasePlatformTests):
         # Build, install, and run the client program
         env2 = {}
         env2['PKG_CONFIG_PATH'] = os.path.join(val2prefix, self.libdir, 'pkgconfig')
-        testdir = os.path.join(self.unit_test_dir, '76 pkgconfig prefixes', 'client')
+        testdir = os.path.join(self.unit_test_dir, '77 pkgconfig prefixes', 'client')
         testprefix = os.path.join(oldinstalldir, 'client')
         self.prefix = testprefix
         self.installdir = testprefix
@@ -7180,7 +7180,7 @@ class LinuxCrossArmTests(BaseLinuxCrossTests):
     def test_cross_libdir_subproject(self):
         # Guard against a regression where calling "subproject"
         # would reset the value of libdir to its default value.
-        testdir = os.path.join(self.unit_test_dir, '76 subdir libdir')
+        testdir = os.path.join(self.unit_test_dir, '78 subdir libdir')
         self.init(testdir, extra_args=['--libdir=fuf'])
         for i in self.introspect('--buildoptions'):
             if i['name'] == 'libdir':
@@ -8017,7 +8017,7 @@ class NativeFileTests(BasePlatformTests):
         self.init(testcase, extra_args=['--native-file', config, '-Dother_one=false'])
 
     def test_user_options_subproject(self):
-        testcase = os.path.join(self.unit_test_dir, '75 user options for subproject')
+        testcase = os.path.join(self.unit_test_dir, '79 user options for subproject')
 
         s = os.path.join(testcase, 'subprojects')
         if not os.path.exists(s):
diff --git a/test cases/cmake/19 cmake file/foolib.cmake.in b/test cases/cmake/20 cmake file/foolib.cmake.in
similarity index 100%
rename from test cases/cmake/19 cmake file/foolib.cmake.in
rename to test cases/cmake/20 cmake file/foolib.cmake.in
diff --git a/test cases/cmake/19 cmake file/meson.build b/test cases/cmake/20 cmake file/meson.build
similarity index 100%
rename from test cases/cmake/19 cmake file/meson.build
rename to test cases/cmake/20 cmake file/meson.build
diff --git a/test cases/cmake/19 cmake file/test.json b/test cases/cmake/20 cmake file/test.json
similarity index 100%
rename from test cases/cmake/19 cmake file/test.json
rename to test cases/cmake/20 cmake file/test.json
diff --git a/test cases/failing/106 number in combo/meson.build b/test cases/failing/107 number in combo/meson.build
similarity index 100%
rename from test cases/failing/106 number in combo/meson.build
rename to test cases/failing/107 number in combo/meson.build
diff --git a/test cases/failing/106 number in combo/nativefile.ini b/test cases/failing/107 number in combo/nativefile.ini
similarity index 100%
rename from test cases/failing/106 number in combo/nativefile.ini
rename to test cases/failing/107 number in combo/nativefile.ini
diff --git a/test cases/failing/106 number in combo/test.json b/test cases/failing/107 number in combo/test.json
similarity index 77%
rename from test cases/failing/106 number in combo/test.json
rename to test cases/failing/107 number in combo/test.json
index a32c35894..f5aeb4e7e 100644
--- a/test cases/failing/106 number in combo/test.json	
+++ b/test cases/failing/107 number in combo/test.json	
@@ -1,5 +1,5 @@
 {
   "stdout": [
-    { "line": "test cases/failing/106 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
+    { "line": "test cases/failing/107 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
   ]
 }
diff --git a/test cases/failing/107 bool in combo/meson.build b/test cases/failing/108 bool in combo/meson.build
similarity index 100%
rename from test cases/failing/107 bool in combo/meson.build
rename to test cases/failing/108 bool in combo/meson.build
diff --git a/test cases/failing/107 bool in combo/meson_options.txt b/test cases/failing/108 bool in combo/meson_options.txt
similarity index 100%
rename from test cases/failing/107 bool in combo/meson_options.txt
rename to test cases/failing/108 bool in combo/meson_options.txt
diff --git a/test cases/failing/107 bool in combo/nativefile.ini b/test cases/failing/108 bool in combo/nativefile.ini
similarity index 100%
rename from test cases/failing/107 bool in combo/nativefile.ini
rename to test cases/failing/108 bool in combo/nativefile.ini
diff --git a/test cases/failing/107 bool in combo/test.json b/test cases/failing/108 bool in combo/test.json
similarity index 73%
rename from test cases/failing/107 bool in combo/test.json
rename to test cases/failing/108 bool in combo/test.json
index 37218e86d..729ad3df5 100644
--- a/test cases/failing/107 bool in combo/test.json	
+++ b/test cases/failing/108 bool in combo/test.json	
@@ -1,5 +1,5 @@
 {
   "stdout": [
-    { "line": "test cases/failing/107 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." }
+    { "line": "test cases/failing/108 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." }
   ]
 }
diff --git a/test cases/unit/76 pkgconfig prefixes/client/client.c b/test cases/unit/77 pkgconfig prefixes/client/client.c
similarity index 100%
rename from test cases/unit/76 pkgconfig prefixes/client/client.c
rename to test cases/unit/77 pkgconfig prefixes/client/client.c
diff --git a/test cases/unit/76 pkgconfig prefixes/client/meson.build b/test cases/unit/77 pkgconfig prefixes/client/meson.build
similarity index 100%
rename from test cases/unit/76 pkgconfig prefixes/client/meson.build
rename to test cases/unit/77 pkgconfig prefixes/client/meson.build
diff --git a/test cases/unit/76 pkgconfig prefixes/val1/meson.build b/test cases/unit/77 pkgconfig prefixes/val1/meson.build
similarity index 100%
rename from test cases/unit/76 pkgconfig prefixes/val1/meson.build
rename to test cases/unit/77 pkgconfig prefixes/val1/meson.build
diff --git a/test cases/unit/76 pkgconfig prefixes/val1/val1.c b/test cases/unit/77 pkgconfig prefixes/val1/val1.c
similarity index 100%
rename from test cases/unit/76 pkgconfig prefixes/val1/val1.c
rename to test cases/unit/77 pkgconfig prefixes/val1/val1.c
diff --git a/test cases/unit/76 pkgconfig prefixes/val1/val1.h b/test cases/unit/77 pkgconfig prefixes/val1/val1.h
similarity index 100%
rename from test cases/unit/76 pkgconfig prefixes/val1/val1.h
rename to test cases/unit/77 pkgconfig prefixes/val1/val1.h
diff --git a/test cases/unit/76 pkgconfig prefixes/val2/meson.build b/test cases/unit/77 pkgconfig prefixes/val2/meson.build
similarity index 100%
rename from test cases/unit/76 pkgconfig prefixes/val2/meson.build
rename to test cases/unit/77 pkgconfig prefixes/val2/meson.build
diff --git a/test cases/unit/76 pkgconfig prefixes/val2/val2.c b/test cases/unit/77 pkgconfig prefixes/val2/val2.c
similarity index 100%
rename from test cases/unit/76 pkgconfig prefixes/val2/val2.c
rename to test cases/unit/77 pkgconfig prefixes/val2/val2.c
diff --git a/test cases/unit/76 pkgconfig prefixes/val2/val2.h b/test cases/unit/77 pkgconfig prefixes/val2/val2.h
similarity index 100%
rename from test cases/unit/76 pkgconfig prefixes/val2/val2.h
rename to test cases/unit/77 pkgconfig prefixes/val2/val2.h
diff --git a/test cases/unit/76 subdir libdir/meson.build b/test cases/unit/78 subdir libdir/meson.build
similarity index 100%
rename from test cases/unit/76 subdir libdir/meson.build
rename to test cases/unit/78 subdir libdir/meson.build
diff --git a/test cases/unit/76 subdir libdir/subprojects/flub/meson.build b/test cases/unit/78 subdir libdir/subprojects/flub/meson.build
similarity index 100%
rename from test cases/unit/76 subdir libdir/subprojects/flub/meson.build
rename to test cases/unit/78 subdir libdir/subprojects/flub/meson.build
diff --git a/test cases/unit/75 user options for subproject/.gitignore b/test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore
similarity index 100%
rename from test cases/unit/75 user options for subproject/.gitignore
rename to test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore
diff --git a/test cases/unit/75 user options for subproject/meson.build b/test cases/unit/79 user options for subproject/75 user options for subproject/meson.build
similarity index 100%
rename from test cases/unit/75 user options for subproject/meson.build
rename to test cases/unit/79 user options for subproject/75 user options for subproject/meson.build
diff --git a/test cases/unit/77 global-rpath/meson.build b/test cases/unit/80 global-rpath/meson.build
similarity index 100%
rename from test cases/unit/77 global-rpath/meson.build
rename to test cases/unit/80 global-rpath/meson.build
diff --git a/test cases/unit/77 global-rpath/rpathified.cpp b/test cases/unit/80 global-rpath/rpathified.cpp
similarity index 100%
rename from test cases/unit/77 global-rpath/rpathified.cpp
rename to test cases/unit/80 global-rpath/rpathified.cpp
diff --git a/test cases/unit/77 global-rpath/yonder/meson.build b/test cases/unit/80 global-rpath/yonder/meson.build
similarity index 100%
rename from test cases/unit/77 global-rpath/yonder/meson.build
rename to test cases/unit/80 global-rpath/yonder/meson.build
diff --git a/test cases/unit/77 global-rpath/yonder/yonder.cpp b/test cases/unit/80 global-rpath/yonder/yonder.cpp
similarity index 100%
rename from test cases/unit/77 global-rpath/yonder/yonder.cpp
rename to test cases/unit/80 global-rpath/yonder/yonder.cpp
diff --git a/test cases/unit/77 global-rpath/yonder/yonder.h b/test cases/unit/80 global-rpath/yonder/yonder.h
similarity index 100%
rename from test cases/unit/77 global-rpath/yonder/yonder.h
rename to test cases/unit/80 global-rpath/yonder/yonder.h
diff --git a/test cases/unit/78 wrap-git/meson.build b/test cases/unit/81 wrap-git/meson.build
similarity index 100%
rename from test cases/unit/78 wrap-git/meson.build
rename to test cases/unit/81 wrap-git/meson.build
diff --git a/test cases/unit/78 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build b/test cases/unit/81 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build
similarity index 100%
rename from test cases/unit/78 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build
rename to test cases/unit/81 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build
diff --git a/test cases/unit/78 wrap-git/subprojects/wrap_git_upstream/main.c b/test cases/unit/81 wrap-git/subprojects/wrap_git_upstream/main.c
similarity index 100%
rename from test cases/unit/78 wrap-git/subprojects/wrap_git_upstream/main.c
rename to test cases/unit/81 wrap-git/subprojects/wrap_git_upstream/main.c