diff --git a/filelist.mk b/filelist.mk
index 2b28c081..765c0255 100644
--- a/filelist.mk
+++ b/filelist.mk
@@ -28,4 +28,4 @@ LIB_SRC := $(COMMON_SRC) \
   api.cpp
 
 TESTS_SRC := $(COMMON_SRC)  \
-  tests/Utility.cpp tests/Identity.cpp tests/Data.cpp
+  tests/Utility.cpp tests/Identity.cpp tests/Base64.cpp
diff --git a/tests/Data.cpp b/tests/Base64.cpp
similarity index 97%
rename from tests/Data.cpp
rename to tests/Base64.cpp
index 9e14ebfe..290b83bf 100644
--- a/tests/Data.cpp
+++ b/tests/Base64.cpp
@@ -1,11 +1,11 @@
 #define BOOST_TEST_DYN_LINK
 
 #include <boost/test/unit_test.hpp>
-#include "../Identity.h"
+#include "util/base64.h"
 
-BOOST_AUTO_TEST_SUITE(DataTests)
+BOOST_AUTO_TEST_SUITE(Base64and32Tests)
 
-using namespace i2p::data;
+using namespace i2p::util;
 
 BOOST_AUTO_TEST_CASE(Base64EncodeEmpty)
 {
diff --git a/tests/Utility.cpp b/tests/Utility.cpp
index 7fabfce7..dbbe2bb6 100644
--- a/tests/Utility.cpp
+++ b/tests/Utility.cpp
@@ -1,5 +1,5 @@
 #include <boost/test/unit_test.hpp>
-#include "../util.h"
+#include "util/util.h"
 
 BOOST_AUTO_TEST_SUITE(UtilityTests)