diff --git a/unit/Makefile b/unit/Makefile
index 04ebf6c6635..2b2cd1432c0 100644
--- a/unit/Makefile
+++ b/unit/Makefile
@@ -19,6 +19,7 @@ SRC += unit_tests.cpp \
        java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp \
        miniBDD_new.cpp \
        java_bytecode/java_string_library_preprocess/convert_exprt_to_string_exprt.cpp \
+       java_bytecode/java_utils_test.cpp \
        solvers/refinement/string_constraint_generator_valueof/calculate_max_string_length.cpp \
        solvers/refinement/string_constraint_generator_valueof/get_numeric_value_from_character.cpp \
        solvers/refinement/string_constraint_generator_valueof/is_digit_with_radix.cpp \
diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp b/unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp
index bb4c6c70337..1b2e6941bd7 100644
--- a/unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp
+++ b/unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp
@@ -6,7 +6,7 @@
 
 \*******************************************************************/
 
-#include <catch.hpp>
+#include <testing-utils/catch.hpp>
 
 #include <istream>
 #include <memory>
@@ -16,7 +16,7 @@
 #include <util/message.h>
 #include <java_bytecode/java_bytecode_language.h>
 #include <iostream>
-#include <src/java_bytecode/load_java_class.h>
+#include <testing-utils/load_java_class.h>
 
 SCENARIO(
   "java_bytecode_parse_derived_generic_class",
diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp b/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp
index 35bf3a273a6..21665f7b523 100644
--- a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp
+++ b/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp
@@ -6,7 +6,7 @@
 
 \*******************************************************************/
 
-#include <catch.hpp>
+#include <testing-utils/catch.hpp>
 
 #include <util/config.h>
 #include <util/cmdline.h>
@@ -14,7 +14,7 @@
 #include <util/prefix.h>
 
 #include <java_bytecode/java_bytecode_language.h>
-#include <src/java_bytecode/load_java_class.h>
+#include <testing-utils/load_java_class.h>
 
 #include <iostream>
 #include <util/namespace.h>
diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp b/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp
index 2ce3d5b5c34..66e89cddb12 100644
--- a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp
+++ b/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp
@@ -6,7 +6,7 @@
 
 \*******************************************************************/
 
-#include <catch.hpp>
+#include <testing-utils/catch.hpp>
 
 #include <util/config.h>
 #include <util/cmdline.h>
@@ -16,7 +16,7 @@
 #include <java_bytecode/java_bytecode_language.h>
 
 #include <iostream>
-#include <src/java_bytecode/load_java_class.h>
+#include <testing-utils/load_java_class.h>
 
 SCENARIO(
   "java_bytecode_parse_generic_function",
diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp b/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp
index 39d9329e2a9..b596572252c 100644
--- a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp
+++ b/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp
@@ -6,7 +6,7 @@
 
 \*******************************************************************/
 
-#include <catch.hpp>
+#include <testing-utils/catch.hpp>
 
 #include <util/config.h>
 #include <util/cmdline.h>
@@ -16,7 +16,7 @@
 #include <java_bytecode/java_bytecode_language.h>
 
 #include <iostream>
-#include <src/java_bytecode/load_java_class.h>
+#include <testing-utils/load_java_class.h>
 
 SCENARIO(
   "java_bytecode_parse_generic_wildcard",
diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_recursive_generic_class.cpp b/unit/java_bytecode/java_bytecode_parse_generics/parse_recursive_generic_class.cpp
index 21c190a88b8..f20de637e5c 100644
--- a/unit/java_bytecode/java_bytecode_parse_generics/parse_recursive_generic_class.cpp
+++ b/unit/java_bytecode/java_bytecode_parse_generics/parse_recursive_generic_class.cpp
@@ -6,7 +6,7 @@
 
 \*******************************************************************/
 
-#include <catch.hpp>
+#include <testing-utils/catch.hpp>
 
 #include <util/config.h>
 #include <util/cmdline.h>
@@ -14,7 +14,7 @@
 #include <util/prefix.h>
 
 #include <java_bytecode/java_bytecode_language.h>
-#include <src/java_bytecode/load_java_class.h>
+#include <testing-utils/load_java_class.h>
 
 #include <iostream>
 #include <util/namespace.h>
diff --git a/unit/java_bytecode/java_utils_test.cpp b/unit/java_bytecode/java_utils_test.cpp
index 5f4ad25bb04..068a3984aca 100644
--- a/unit/java_bytecode/java_utils_test.cpp
+++ b/unit/java_bytecode/java_utils_test.cpp
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include <catch.hpp>
+#include <testing-utils/catch.hpp>
 
 #include <java_bytecode/java_utils.h>