diff --git a/test cases/common/273 environment/meson.build b/test cases/common/274 environment/meson.build
similarity index 100%
rename from test cases/common/273 environment/meson.build
rename to test cases/common/274 environment/meson.build
diff --git a/test cases/common/273 environment/testenv.py b/test cases/common/274 environment/testenv.py
similarity index 100%
rename from test cases/common/273 environment/testenv.py
rename to test cases/common/274 environment/testenv.py
diff --git a/test cases/failing build/2 hidden symbol/bob.c b/test cases/failing build/1 hidden symbol/bob.c
similarity index 100%
rename from test cases/failing build/2 hidden symbol/bob.c
rename to test cases/failing build/1 hidden symbol/bob.c
diff --git a/test cases/failing build/2 hidden symbol/bob.h b/test cases/failing build/1 hidden symbol/bob.h
similarity index 100%
rename from test cases/failing build/2 hidden symbol/bob.h
rename to test cases/failing build/1 hidden symbol/bob.h
diff --git a/test cases/failing build/2 hidden symbol/bobuser.c b/test cases/failing build/1 hidden symbol/bobuser.c
similarity index 100%
rename from test cases/failing build/2 hidden symbol/bobuser.c
rename to test cases/failing build/1 hidden symbol/bobuser.c
diff --git a/test cases/failing build/2 hidden symbol/meson.build b/test cases/failing build/1 hidden symbol/meson.build
similarity index 100%
rename from test cases/failing build/2 hidden symbol/meson.build
rename to test cases/failing build/1 hidden symbol/meson.build
diff --git a/test cases/failing build/3 pch disabled/c/meson.build b/test cases/failing build/2 pch disabled/c/meson.build
similarity index 100%
rename from test cases/failing build/3 pch disabled/c/meson.build
rename to test cases/failing build/2 pch disabled/c/meson.build
diff --git a/test cases/failing build/3 pch disabled/c/pch/prog.h b/test cases/failing build/2 pch disabled/c/pch/prog.h
similarity index 100%
rename from test cases/failing build/3 pch disabled/c/pch/prog.h
rename to test cases/failing build/2 pch disabled/c/pch/prog.h
diff --git a/test cases/failing build/3 pch disabled/c/pch/prog_pch.c b/test cases/failing build/2 pch disabled/c/pch/prog_pch.c
similarity index 100%
rename from test cases/failing build/3 pch disabled/c/pch/prog_pch.c
rename to test cases/failing build/2 pch disabled/c/pch/prog_pch.c
diff --git a/test cases/failing build/3 pch disabled/c/prog.c b/test cases/failing build/2 pch disabled/c/prog.c
similarity index 100%
rename from test cases/failing build/3 pch disabled/c/prog.c
rename to test cases/failing build/2 pch disabled/c/prog.c
diff --git a/test cases/failing build/3 pch disabled/meson.build b/test cases/failing build/2 pch disabled/meson.build
similarity index 100%
rename from test cases/failing build/3 pch disabled/meson.build
rename to test cases/failing build/2 pch disabled/meson.build
diff --git a/test cases/failing build/4 cmake subproject isolation/incDir/fileA.hpp b/test cases/failing build/3 cmake subproject isolation/incDir/fileA.hpp
similarity index 100%
rename from test cases/failing build/4 cmake subproject isolation/incDir/fileA.hpp
rename to test cases/failing build/3 cmake subproject isolation/incDir/fileA.hpp
diff --git a/test cases/failing build/4 cmake subproject isolation/main.cpp b/test cases/failing build/3 cmake subproject isolation/main.cpp
similarity index 100%
rename from test cases/failing build/4 cmake subproject isolation/main.cpp
rename to test cases/failing build/3 cmake subproject isolation/main.cpp
diff --git a/test cases/failing build/4 cmake subproject isolation/meson.build b/test cases/failing build/3 cmake subproject isolation/meson.build
similarity index 100%
rename from test cases/failing build/4 cmake subproject isolation/meson.build
rename to test cases/failing build/3 cmake subproject isolation/meson.build
diff --git a/test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/CMakeLists.txt b/test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/CMakeLists.txt
similarity index 100%
rename from test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/CMakeLists.txt
rename to test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/CMakeLists.txt
diff --git a/test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/cmMod.cpp b/test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/cmMod.cpp
similarity index 100%
rename from test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/cmMod.cpp
rename to test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/cmMod.cpp
diff --git a/test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/cmMod.hpp b/test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/cmMod.hpp
similarity index 100%
rename from test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/cmMod.hpp
rename to test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/cmMod.hpp
diff --git a/test cases/failing build/4 cmake subproject isolation/test.json b/test cases/failing build/3 cmake subproject isolation/test.json
similarity index 100%
rename from test cases/failing build/4 cmake subproject isolation/test.json
rename to test cases/failing build/3 cmake subproject isolation/test.json
diff --git a/test cases/failing build/5 failed pickled/false.py b/test cases/failing build/4 failed pickled/false.py
similarity index 100%
rename from test cases/failing build/5 failed pickled/false.py
rename to test cases/failing build/4 failed pickled/false.py
diff --git a/test cases/failing build/5 failed pickled/meson.build b/test cases/failing build/4 failed pickled/meson.build
similarity index 100%
rename from test cases/failing build/5 failed pickled/meson.build
rename to test cases/failing build/4 failed pickled/meson.build
diff --git a/test cases/osx/9 global variable ar/libfile.c b/test cases/osx/10 global variable ar/libfile.c
similarity index 100%
rename from test cases/osx/9 global variable ar/libfile.c
rename to test cases/osx/10 global variable ar/libfile.c
diff --git a/test cases/osx/9 global variable ar/libfile2.c b/test cases/osx/10 global variable ar/libfile2.c
similarity index 100%
rename from test cases/osx/9 global variable ar/libfile2.c
rename to test cases/osx/10 global variable ar/libfile2.c
diff --git a/test cases/osx/9 global variable ar/meson.build b/test cases/osx/10 global variable ar/meson.build
similarity index 100%
rename from test cases/osx/9 global variable ar/meson.build
rename to test cases/osx/10 global variable ar/meson.build
diff --git a/test cases/osx/9 global variable ar/nativefile.ini b/test cases/osx/10 global variable ar/nativefile.ini
similarity index 100%
rename from test cases/osx/9 global variable ar/nativefile.ini
rename to test cases/osx/10 global variable ar/nativefile.ini
diff --git a/test cases/osx/9 global variable ar/prog.c b/test cases/osx/10 global variable ar/prog.c
similarity index 100%
rename from test cases/osx/9 global variable ar/prog.c
rename to test cases/osx/10 global variable ar/prog.c