diff --git a/meson.build b/meson.build
index ceae570..7293268 100644
--- a/meson.build
+++ b/meson.build
@@ -124,13 +124,13 @@ alltests = executable('alltests',
 	'test/webfuse/tests/core/jsonrpc/test_response_parser.cc',
 	'test/webfuse/tests/core/timer/test_timepoint.cc',
 	'test/webfuse/tests/core/timer/test_timer.cc',
-	'test/webfuse/utils/tempdir.cc',
-	'test/webfuse/utils/file_utils.cc',
-	'test/webfuse/utils/timeout_watcher.cc',
-	'test/webfuse/utils/ws_server.cc',
-	'test/webfuse/utils/ws_server2.cc',
-	'test/webfuse/utils/adapter_client.cc',
-	'test/webfuse/utils/jansson_test_environment.cc',
+	'test/webfuse/test_util/tempdir.cc',
+	'test/webfuse/test_util/file_utils.cc',
+	'test/webfuse/test_util/timeout_watcher.cc',
+	'test/webfuse/test_util/ws_server.cc',
+	'test/webfuse/test_util/ws_server2.cc',
+	'test/webfuse/test_util/adapter_client.cc',
+	'test/webfuse/test_util/jansson_test_environment.cc',
 	'test/webfuse/mocks/mock_authenticator.cc',
 	'test/webfuse/mocks/mock_fuse.cc',
 	'test/webfuse/mocks/mock_operation_context.cc',
diff --git a/test/webfuse/mocks/mock_fuse.cc b/test/webfuse/mocks/mock_fuse.cc
index 486c8ed..cbd7164 100644
--- a/test/webfuse/mocks/mock_fuse.cc
+++ b/test/webfuse/mocks/mock_fuse.cc
@@ -1,5 +1,5 @@
 #include "webfuse/mocks/mock_fuse.hpp"
-#include "webfuse/utils/wrap.hpp"
+#include "webfuse/test_util/wrap.hpp"
 
 extern "C"
 {
diff --git a/test/webfuse/mocks/mock_invokation_handler.hpp b/test/webfuse/mocks/mock_invokation_handler.hpp
index 48d3b8b..d662778 100644
--- a/test/webfuse/mocks/mock_invokation_handler.hpp
+++ b/test/webfuse/mocks/mock_invokation_handler.hpp
@@ -1,7 +1,7 @@
 #ifndef WF_MOCK_INVOKATION_HANDLER_HPP
 #define WF_MOCK_INVOKATION_HANDLER_HPP
 
-#include "webfuse/utils/ws_server2.hpp"
+#include "webfuse/test_util/ws_server2.hpp"
 #include <gtest/gtest.h>
 
 namespace webfuse_test
diff --git a/test/webfuse/mocks/mock_jsonrpc_proxy.cc b/test/webfuse/mocks/mock_jsonrpc_proxy.cc
index bc21399..a2598b3 100644
--- a/test/webfuse/mocks/mock_jsonrpc_proxy.cc
+++ b/test/webfuse/mocks/mock_jsonrpc_proxy.cc
@@ -1,5 +1,5 @@
 #include "webfuse/mocks/mock_jsonrpc_proxy.hpp"
-#include "webfuse/utils/wrap.hpp"
+#include "webfuse/test_util/wrap.hpp"
 
 extern "C"
 {
diff --git a/test/webfuse/mocks/mock_operation_context.cc b/test/webfuse/mocks/mock_operation_context.cc
index 9537533..c6158c4 100644
--- a/test/webfuse/mocks/mock_operation_context.cc
+++ b/test/webfuse/mocks/mock_operation_context.cc
@@ -1,5 +1,5 @@
 #include "webfuse/mocks/mock_operation_context.hpp"
-#include "webfuse/utils/wrap.hpp"
+#include "webfuse/test_util/wrap.hpp"
 
 extern "C"
 {
diff --git a/test/webfuse/utils/adapter_client.cc b/test/webfuse/test_util/adapter_client.cc
similarity index 97%
rename from test/webfuse/utils/adapter_client.cc
rename to test/webfuse/test_util/adapter_client.cc
index d1dbb4e..0822292 100644
--- a/test/webfuse/utils/adapter_client.cc
+++ b/test/webfuse/test_util/adapter_client.cc
@@ -1,5 +1,5 @@
-#include "webfuse/utils/adapter_client.hpp"
-#include "webfuse/utils/tempdir.hpp"
+#include "webfuse/test_util/adapter_client.hpp"
+#include "webfuse/test_util/tempdir.hpp"
 #include <thread>
 #include <mutex>
 
diff --git a/test/webfuse/utils/adapter_client.hpp b/test/webfuse/test_util/adapter_client.hpp
similarity index 87%
rename from test/webfuse/utils/adapter_client.hpp
rename to test/webfuse/test_util/adapter_client.hpp
index 0f8bde8..8a5aba0 100644
--- a/test/webfuse/utils/adapter_client.hpp
+++ b/test/webfuse/test_util/adapter_client.hpp
@@ -1,5 +1,5 @@
-#ifndef WF_UTILS_ADAPTER_CLIENT_HPP
-#define WF_UTILS_APAPTER_CLIENT_HPP
+#ifndef WF_TEST_UTIL_ADAPTER_CLIENT_HPP
+#define WF_TEST_UTIL_APAPTER_CLIENT_HPP
 
 #include "webfuse/client.h"
 #include <string>
diff --git a/test/webfuse/utils/file_utils.cc b/test/webfuse/test_util/file_utils.cc
similarity index 94%
rename from test/webfuse/utils/file_utils.cc
rename to test/webfuse/test_util/file_utils.cc
index 7a3d29c..a5a62f7 100644
--- a/test/webfuse/utils/file_utils.cc
+++ b/test/webfuse/test_util/file_utils.cc
@@ -1,4 +1,4 @@
-#include "webfuse/utils/file_utils.hpp"
+#include "webfuse/test_util/file_utils.hpp"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/test/webfuse/utils/file_utils.hpp b/test/webfuse/test_util/file_utils.hpp
similarity index 74%
rename from test/webfuse/utils/file_utils.hpp
rename to test/webfuse/test_util/file_utils.hpp
index 0c8cbc1..adb81d5 100644
--- a/test/webfuse/utils/file_utils.hpp
+++ b/test/webfuse/test_util/file_utils.hpp
@@ -1,5 +1,5 @@
-#ifndef WF_TEST_FILE_UTILS_HPP
-#define WF_TEST_FILE_UTILS_HPP
+#ifndef WF_TEST_UTIL_FILE_UTILS_HPP
+#define WF_TEST_UTIL_FILE_UTILS_HPP
 
 #include <string>
 
diff --git a/test/webfuse/utils/jansson_test_environment.cc b/test/webfuse/test_util/jansson_test_environment.cc
similarity index 100%
rename from test/webfuse/utils/jansson_test_environment.cc
rename to test/webfuse/test_util/jansson_test_environment.cc
diff --git a/test/webfuse/utils/tempdir.cc b/test/webfuse/test_util/tempdir.cc
similarity index 91%
rename from test/webfuse/utils/tempdir.cc
rename to test/webfuse/test_util/tempdir.cc
index 46b78a7..783efee 100644
--- a/test/webfuse/utils/tempdir.cc
+++ b/test/webfuse/test_util/tempdir.cc
@@ -1,4 +1,4 @@
-#include "webfuse/utils/tempdir.hpp"
+#include "webfuse/test_util/tempdir.hpp"
 
 #include <unistd.h>
 #include <cstdio>
diff --git a/test/webfuse/utils/tempdir.hpp b/test/webfuse/test_util/tempdir.hpp
similarity index 80%
rename from test/webfuse/utils/tempdir.hpp
rename to test/webfuse/test_util/tempdir.hpp
index 6a03fc5..084febc 100644
--- a/test/webfuse/utils/tempdir.hpp
+++ b/test/webfuse/test_util/tempdir.hpp
@@ -1,5 +1,5 @@
-#ifndef WF_TEST_TEMPDIR_HPP
-#define WF_TEST_TEMPDIR_HPP
+#ifndef WF_TEST_UTIL_TEMPDIR_HPP
+#define WF_TEST_UTIL_TEMPDIR_HPP
 
 namespace webfuse_test
 {
diff --git a/test/webfuse/utils/timeout_watcher.cc b/test/webfuse/test_util/timeout_watcher.cc
similarity index 94%
rename from test/webfuse/utils/timeout_watcher.cc
rename to test/webfuse/test_util/timeout_watcher.cc
index 705f1f3..d9dcd98 100644
--- a/test/webfuse/utils/timeout_watcher.cc
+++ b/test/webfuse/test_util/timeout_watcher.cc
@@ -1,4 +1,4 @@
-#include "webfuse/utils/timeout_watcher.hpp"
+#include "webfuse/test_util/timeout_watcher.hpp"
 #include <stdexcept>
 #include <thread>
 
diff --git a/test/webfuse/utils/timeout_watcher.hpp b/test/webfuse/test_util/timeout_watcher.hpp
similarity index 86%
rename from test/webfuse/utils/timeout_watcher.hpp
rename to test/webfuse/test_util/timeout_watcher.hpp
index 3696dd1..1984e53 100644
--- a/test/webfuse/utils/timeout_watcher.hpp
+++ b/test/webfuse/test_util/timeout_watcher.hpp
@@ -1,5 +1,5 @@
-#ifndef WF_TEST_TIMEOUT_WATCHER_HPP
-#define WF_TEST_TIMEOUT_WATCHER_HPP
+#ifndef WF_TEST_UTIL_TIMEOUT_WATCHER_HPP
+#define WF_TEST_UTIL_TIMEOUT_WATCHER_HPP
 
 #include <chrono>
 #include <functional>
diff --git a/test/webfuse/utils/wrap.hpp b/test/webfuse/test_util/wrap.hpp
similarity index 98%
rename from test/webfuse/utils/wrap.hpp
rename to test/webfuse/test_util/wrap.hpp
index 30694de..bd21bae 100644
--- a/test/webfuse/utils/wrap.hpp
+++ b/test/webfuse/test_util/wrap.hpp
@@ -1,5 +1,5 @@
-#ifndef WF_WRAP_HPP
-#define WF_WRAP_HPP
+#ifndef WF_TEST_UTIL_WRAP_HPP
+#define WF_TEST_UTIL_WRAP_HPP
 
 #define WF_WRAP_FUNC0( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME ) \
     extern RETURN_TYPE __real_ ## FUNC_NAME (); \
diff --git a/test/webfuse/utils/ws_server.cc b/test/webfuse/test_util/ws_server.cc
similarity index 99%
rename from test/webfuse/utils/ws_server.cc
rename to test/webfuse/test_util/ws_server.cc
index 3edb2fc..91a4457 100644
--- a/test/webfuse/utils/ws_server.cc
+++ b/test/webfuse/test_util/ws_server.cc
@@ -1,4 +1,4 @@
-#include "webfuse/utils/ws_server.h"
+#include "webfuse/test_util/ws_server.h"
 #include "webfuse/impl/util/lws_log.h"
 
 #include <libwebsockets.h>
diff --git a/test/webfuse/utils/ws_server.h b/test/webfuse/test_util/ws_server.h
similarity index 86%
rename from test/webfuse/utils/ws_server.h
rename to test/webfuse/test_util/ws_server.h
index a51f695..07d6337 100644
--- a/test/webfuse/utils/ws_server.h
+++ b/test/webfuse/test_util/ws_server.h
@@ -1,5 +1,5 @@
-#ifndef WF_TEST_UTILS_WS_SERVER_HPP
-#define WF_TEST_UTILS_WS_SERVER_HPP
+#ifndef WF_TEST_UTIL_WS_SERVER_HPP
+#define WF_TEST_UTIL_WS_SERVER_HPP
 
 #include <jansson.h>
 #include <string>
diff --git a/test/webfuse/utils/ws_server2.cc b/test/webfuse/test_util/ws_server2.cc
similarity index 99%
rename from test/webfuse/utils/ws_server2.cc
rename to test/webfuse/test_util/ws_server2.cc
index 94f518c..83bc2a7 100644
--- a/test/webfuse/utils/ws_server2.cc
+++ b/test/webfuse/test_util/ws_server2.cc
@@ -1,4 +1,4 @@
-#include "webfuse/utils/ws_server2.hpp"
+#include "webfuse/test_util/ws_server2.hpp"
 #include "webfuse/impl/util/lws_log.h"
 
 #include <libwebsockets.h>
diff --git a/test/webfuse/utils/ws_server2.hpp b/test/webfuse/test_util/ws_server2.hpp
similarity index 90%
rename from test/webfuse/utils/ws_server2.hpp
rename to test/webfuse/test_util/ws_server2.hpp
index b29ffb1..eb7df9a 100644
--- a/test/webfuse/utils/ws_server2.hpp
+++ b/test/webfuse/test_util/ws_server2.hpp
@@ -1,5 +1,5 @@
-#ifndef WF_TEST_UTILS_WS_SERVER2_HPP
-#define WF_TEST_UTILS_WS_SERVER2_HPP
+#ifndef WF_TEST_UTIL_WS_SERVER2_HPP
+#define WF_TEST_UTIL_WS_SERVER2_HPP
 
 #include <jansson.h>
 #include <string>
diff --git a/test/webfuse/tests/adapter/test_client.cc b/test/webfuse/tests/adapter/test_client.cc
index cb7b4eb..a70e511 100644
--- a/test/webfuse/tests/adapter/test_client.cc
+++ b/test/webfuse/tests/adapter/test_client.cc
@@ -1,14 +1,14 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "webfuse/utils/adapter_client.hpp"
+#include "webfuse/test_util/adapter_client.hpp"
 #include "webfuse/client_tlsconfig.h"
 #include "webfuse/credentials.h"
 #include "webfuse/protocol_names.h"
-#include "webfuse/utils/ws_server2.hpp"
+#include "webfuse/test_util/ws_server2.hpp"
 #include "webfuse/mocks/mock_adapter_client_callback.hpp"
 #include "webfuse/mocks/mock_invokation_handler.hpp"
-#include "webfuse/utils/timeout_watcher.hpp"
+#include "webfuse/test_util/timeout_watcher.hpp"
 #include "webfuse/tests/integration/file.hpp"
 #include "webfuse/mocks/lookup_matcher.hpp"
 
diff --git a/test/webfuse/tests/adapter/test_server_config.cc b/test/webfuse/tests/adapter/test_server_config.cc
index 099b16b..2e6ce9c 100644
--- a/test/webfuse/tests/adapter/test_server_config.cc
+++ b/test/webfuse/tests/adapter/test_server_config.cc
@@ -2,7 +2,7 @@
 #include "webfuse/server_config.h"
 #include "webfuse/impl/server_config.h"
 #include "webfuse/impl/authenticator.h"
-#include "webfuse/utils/tempdir.hpp"
+#include "webfuse/test_util/tempdir.hpp"
 
 using webfuse_test::TempDir;
 
diff --git a/test/webfuse/tests/core/jsonrpc/mock_timer.cc b/test/webfuse/tests/core/jsonrpc/mock_timer.cc
index 3bff25f..1703f3c 100644
--- a/test/webfuse/tests/core/jsonrpc/mock_timer.cc
+++ b/test/webfuse/tests/core/jsonrpc/mock_timer.cc
@@ -1,5 +1,5 @@
 #include "webfuse/tests/core/jsonrpc/mock_timer.hpp"
-#include "webfuse/utils/wrap.hpp"
+#include "webfuse/test_util/wrap.hpp"
 
 extern "C"
 {
diff --git a/test/webfuse/tests/integration/test_lowlevel.cc b/test/webfuse/tests/integration/test_lowlevel.cc
index 5cdf4bd..9155b16 100644
--- a/test/webfuse/tests/integration/test_lowlevel.cc
+++ b/test/webfuse/tests/integration/test_lowlevel.cc
@@ -2,7 +2,7 @@
 #include "webfuse_provider.h"
 #include <libwebsockets.h>
 
-#include "webfuse/utils/tempdir.hpp"
+#include "webfuse/test_util/tempdir.hpp"
 
 #include <gtest/gtest.h>