diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 04d580f5..044f997a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src)
 
 add_definitions(-DQT_TEST_LIB)
 
-set( KEEPASSX_TEST_TREE ${CMAKE_SOURCE_DIR}/tests )
+set( KEEPASSX_TEST_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data )
 configure_file( config-keepassx-tests.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-keepassx-tests.h )
 
 MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
diff --git a/tests/TestKeePass2Reader.cpp b/tests/TestKeePass2Reader.cpp
index c41d42f3..c92624ef 100644
--- a/tests/TestKeePass2Reader.cpp
+++ b/tests/TestKeePass2Reader.cpp
@@ -34,7 +34,7 @@ void TestKeePass2Reader::initTestCase()
 
 void TestKeePass2Reader::testNonAscii()
 {
-    QString filename = QString(KEEPASSX_TEST_DIR).append("/NonAscii.kdbx");
+    QString filename = QString(KEEPASSX_TEST_DATA_DIR).append("/NonAscii.kdbx");
     CompositeKey key;
     key.addKey(PasswordKey(QString::fromUtf8("\xce\x94\xc3\xb6\xd8\xb6")));
     KeePass2Reader* reader = new KeePass2Reader();
@@ -49,7 +49,7 @@ void TestKeePass2Reader::testNonAscii()
 
 void TestKeePass2Reader::testCompressed()
 {
-    QString filename = QString(KEEPASSX_TEST_DIR).append("/Compressed.kdbx");
+    QString filename = QString(KEEPASSX_TEST_DATA_DIR).append("/Compressed.kdbx");
     CompositeKey key;
     key.addKey(PasswordKey(""));
     KeePass2Reader* reader = new KeePass2Reader();
@@ -64,7 +64,7 @@ void TestKeePass2Reader::testCompressed()
 
 void TestKeePass2Reader::testProtectedStrings()
 {
-    QString filename = QString(KEEPASSX_TEST_DIR).append("/ProtectedStrings.kdbx");
+    QString filename = QString(KEEPASSX_TEST_DATA_DIR).append("/ProtectedStrings.kdbx");
     CompositeKey key;
     key.addKey(PasswordKey("masterpw"));
     KeePass2Reader* reader = new KeePass2Reader();
diff --git a/tests/TestKeePass2XmlReader.cpp b/tests/TestKeePass2XmlReader.cpp
index 2678a464..daf6cf39 100644
--- a/tests/TestKeePass2XmlReader.cpp
+++ b/tests/TestKeePass2XmlReader.cpp
@@ -64,7 +64,7 @@ QDateTime TestKeePass2XmlReader::genDT(int year, int month, int day, int hour, i
 void TestKeePass2XmlReader::initTestCase()
 {
     KeePass2XmlReader* reader = new KeePass2XmlReader();
-    QString xmlFile = QString(KEEPASSX_TEST_DIR).append("/NewDatabase.xml");
+    QString xmlFile = QString(KEEPASSX_TEST_DATA_DIR).append("/NewDatabase.xml");
     m_db = reader->readDatabase(xmlFile);
     QVERIFY(m_db);
     QVERIFY(!reader->error());
diff --git a/tests/config-keepassx-tests.h.cmake b/tests/config-keepassx-tests.h.cmake
index dcbe20b0..405362d9 100644
--- a/tests/config-keepassx-tests.h.cmake
+++ b/tests/config-keepassx-tests.h.cmake
@@ -1,3 +1,3 @@
 /* config-keepassx-tests.h. Generated by cmake from config-keepassx-tests.h.cmake */
 
-#define KEEPASSX_TEST_DIR "${KEEPASSX_TEST_TREE}"
+#define KEEPASSX_TEST_DATA_DIR "${KEEPASSX_TEST_DATA_DIR}"
diff --git a/tests/Compressed.kdbx b/tests/data/Compressed.kdbx
similarity index 100%
rename from tests/Compressed.kdbx
rename to tests/data/Compressed.kdbx
diff --git a/tests/NewDatabase.kdbx b/tests/data/NewDatabase.kdbx
similarity index 100%
rename from tests/NewDatabase.kdbx
rename to tests/data/NewDatabase.kdbx
diff --git a/tests/NewDatabase.xml b/tests/data/NewDatabase.xml
similarity index 100%
rename from tests/NewDatabase.xml
rename to tests/data/NewDatabase.xml
diff --git a/tests/NonAscii.kdbx b/tests/data/NonAscii.kdbx
similarity index 100%
rename from tests/NonAscii.kdbx
rename to tests/data/NonAscii.kdbx
diff --git a/tests/ProtectedStrings.kdbx b/tests/data/ProtectedStrings.kdbx
similarity index 100%
rename from tests/ProtectedStrings.kdbx
rename to tests/data/ProtectedStrings.kdbx