diff --git a/test/framework/utils.cc b/test/framework/test_utils.cc
similarity index 99%
rename from test/framework/utils.cc
rename to test/framework/test_utils.cc
index a33eb28..85afad9 100644
--- a/test/framework/utils.cc
+++ b/test/framework/test_utils.cc
@@ -1,4 +1,4 @@
-#include "utils.hh"
+#include "test_utils.hh"
 
 #include <pEp/pEpEngine.h>
 #include <pEp/message_api.h>
diff --git a/test/framework/utils.hh b/test/framework/test_utils.hh
similarity index 100%
rename from test/framework/utils.hh
rename to test/framework/test_utils.hh
diff --git a/test/pitytest11/Makefile b/test/pitytest11/Makefile
index fa093cb..9c55d18 100644
--- a/test/pitytest11/Makefile
+++ b/test/pitytest11/Makefile
@@ -4,7 +4,7 @@ TARGET=src/libPityTest.a
 LDFLAGS:=-L../../src/ $(LDFLAGS) -L../framework/
 LDLIBS=-lstdc++ -lpEpAdapter -lpEpEngine -lpthread -ldl
 CXXFLAGS:=-std=c++11 -g -I./src $(CXXFLAGS)
-TEST_EXTRA_OBJS=../framework/utils.o
+TEST_EXTRA_OBJS=../framework/test_utils.o
 
 # Src
 SRC=$(wildcard src/*.cc)
diff --git a/test/pitytest11/src/PityNode.hh b/test/pitytest11/src/PityNode.hh
index a4a71ea..a18edc8 100644
--- a/test/pitytest11/src/PityNode.hh
+++ b/test/pitytest11/src/PityNode.hh
@@ -5,7 +5,7 @@
 #define PITYTEST_PITYNODE_HH
 
 #include "../../../src/pEpLog.hh"
-#include "../../framework/utils.hh"
+#include "../../framework/test_utils.hh"
 
 namespace pEp {
     namespace PityTest11 {
diff --git a/test/pitytest11/src/PityPerspective.hh b/test/pitytest11/src/PityPerspective.hh
index 70b09a3..ce32ba4 100644
--- a/test/pitytest11/src/PityPerspective.hh
+++ b/test/pitytest11/src/PityPerspective.hh
@@ -5,7 +5,7 @@
 #define PITYTEST_PITYPERSPECTIVE_HH
 
 #include "../../../src/pEpLog.hh"
-#include "../../framework/utils.hh"
+#include "../../framework/test_utils.hh"
 #include "PityModel.hh"
 #include <map>
 
diff --git a/test/test_adapter.cc b/test/test_adapter.cc
index 3fee1e5..35dc834 100644
--- a/test/test_adapter.cc
+++ b/test/test_adapter.cc
@@ -2,7 +2,7 @@
 // see LICENSE.txt
 
 #include "framework/framework.hh"
-#include "framework/utils.hh"
+#include "framework/test_utils.hh"
 #include <iostream>
 #include <assert.h>
 
diff --git a/test/test_adapter_cxx.cc b/test/test_adapter_cxx.cc
index e21c340..1d9df50 100644
--- a/test/test_adapter_cxx.cc
+++ b/test/test_adapter_cxx.cc
@@ -2,7 +2,7 @@
 // see LICENSE.txt
 
 #include "framework/framework.hh"
-#include "framework/utils.hh"
+#include "framework/test_utils.hh"
 #include <iostream>
 #include <assert.h>
 
diff --git a/test/test_group.cc b/test/test_group.cc
index b7072a6..4bb6d18 100644
--- a/test/test_group.cc
+++ b/test/test_group.cc
@@ -2,7 +2,7 @@
 // see LICENSE.txt
 
 #include "framework/framework.hh"
-#include "framework/utils.hh"
+#include "framework/test_utils.hh"
 
 //#include <iostream>
 
diff --git a/test/test_listmanager_dummy.cc b/test/test_listmanager_dummy.cc
index b229c2a..d7a3173 100644
--- a/test/test_listmanager_dummy.cc
+++ b/test/test_listmanager_dummy.cc
@@ -1,6 +1,6 @@
 #include "../src/listmanager_dummy.hh"
 #include "../src/utils.hh"
-#include "framework/utils.hh"
+#include "framework/test_utils.hh"
 #include <exception>
 #include <map>
 #include <cassert>
diff --git a/test/test_pEpSQLite.cc b/test/test_pEpSQLite.cc
index 88a5e66..2277a70 100644
--- a/test/test_pEpSQLite.cc
+++ b/test/test_pEpSQLite.cc
@@ -2,7 +2,7 @@
 #include "../src/pEpSQLite.hh"
 #include "../src/utils.hh"
 #include "../src/std_utils.hh"
-#include "framework/utils.hh"
+#include "framework/test_utils.hh"
 
 #include <fstream>
 #include <cassert>
diff --git a/test/test_swarm_group.cc b/test/test_swarm_group.cc
index 6c231d1..a62b5a1 100644
--- a/test/test_swarm_group.cc
+++ b/test/test_swarm_group.cc
@@ -1,7 +1,7 @@
 #include "pitytest11/src/PityTest.hh"
 #include "../src/utils.hh"
 #include "framework/framework.hh"
-#include "framework/utils.hh"
+#include "framework/test_utils.hh"
 
 // libpEpAdapter
 #include "../src/Adapter.hh"
diff --git a/test/test_swarm_tofu.cc b/test/test_swarm_tofu.cc
index cad3a19..c973def 100644
--- a/test/test_swarm_tofu.cc
+++ b/test/test_swarm_tofu.cc
@@ -1,7 +1,7 @@
 #include "pitytest11/src/PityTest.hh"
 #include "../src/utils.hh"
 #include "framework/framework.hh"
-#include "framework/utils.hh"
+#include "framework/test_utils.hh"
 
 // libpEpAdapter
 #include "../src/Adapter.hh"
diff --git a/test/test_sync_init.cc b/test/test_sync_init.cc
index acbc50b..b7d01c5 100644
--- a/test/test_sync_init.cc
+++ b/test/test_sync_init.cc
@@ -2,7 +2,7 @@
 // see LICENSE.txt
 
 #include "framework/framework.hh"
-#include "framework/utils.hh"
+#include "framework/test_utils.hh"
 #include <iostream>
 #include <assert.h>
 
diff --git a/test/test_template_swarm_multi.cc b/test/test_template_swarm_multi.cc
index c950194..4b9eed2 100644
--- a/test/test_template_swarm_multi.cc
+++ b/test/test_template_swarm_multi.cc
@@ -1,7 +1,7 @@
 #include "pitytest11/src/PityTest.hh"
 #include "../src/utils.hh"
 #include "framework/framework.hh"
-#include "framework/utils.hh"
+#include "framework/test_utils.hh"
 
 #include <pEp/pEpEngine.h>
 #include <pEp/message_api.h>
diff --git a/test/test_template_swarm_single.cc b/test/test_template_swarm_single.cc
index 882cb44..fc6fc2d 100644
--- a/test/test_template_swarm_single.cc
+++ b/test/test_template_swarm_single.cc
@@ -1,7 +1,7 @@
 #include "pitytest11/src/PityTest.hh"
 #include "../src/utils.hh"
 #include "framework/framework.hh"
-#include "framework/utils.hh"
+#include "framework/test_utils.hh"
 
 #include <pEp/pEpEngine.h>
 #include <pEp/message_api.h>
diff --git a/test/test_tofu.cc b/test/test_tofu.cc
index e67daff..b73358f 100644
--- a/test/test_tofu.cc
+++ b/test/test_tofu.cc
@@ -1,7 +1,7 @@
 #include "pitytest11/src/PityTest.hh"
 #include "../src/utils.hh"
 #include "framework/framework.hh"
-#include "framework/utils.hh"
+#include "framework/test_utils.hh"
 
 #include <pEp/pEpEngine.h>
 #include <pEp/keymanagement.h>