diff --git a/tests/testapplication.pri b/tests/testapplication.pri
index cfce5c1..5493c34 100644
--- a/tests/testapplication.pri
+++ b/tests/testapplication.pri
@@ -8,4 +8,6 @@ INSTALLS += test_data
 
 test_data_etc.path = $${TESTS_DATA_PATH}/configroot/etc/ssu
 test_data_usr_share.path = $${TESTS_DATA_PATH}/configroot/usr/share/ssu
-INSTALLS += test_data_etc test_data_usr_share
+test_data_boardmappings_d.path = $${TESTS_DATA_PATH}/configroot/usr/share/ssu/board-mappings.d
+
+INSTALLS += test_data_etc test_data_usr_share test_data_boardmappings_d
diff --git a/tests/ut_deviceinfo/ut_deviceinfo.pro b/tests/ut_deviceinfo/ut_deviceinfo.pro
index 02c0d4b..9e04164 100644
--- a/tests/ut_deviceinfo/ut_deviceinfo.pro
+++ b/tests/ut_deviceinfo/ut_deviceinfo.pro
@@ -10,9 +10,11 @@ SOURCES = \
         deviceinfotest.cpp \
 
 test_data_etc.files = \
-	testdata/ssu.ini \
+        testdata/ssu.ini \
 
 test_data_usr_share.files = \
-	testdata/ssu-defaults.ini \
-        testdata/board-mappings.ini \
+        testdata/ssu-defaults.ini \
         testdata/repos.ini \
+
+test_data_boardmappings_d.files = \
+        testdata/board-mappings.ini \
\ No newline at end of file
diff --git a/tests/ut_ssucli/ut_ssucli.pro b/tests/ut_ssucli/ut_ssucli.pro
index 6e59945..2893e7d 100644
--- a/tests/ut_ssucli/ut_ssucli.pro
+++ b/tests/ut_ssucli/ut_ssucli.pro
@@ -15,4 +15,6 @@ test_data_etc.files = \
 test_data_usr_share.files = \
         testdata/ssu-defaults.ini \
         testdata/repos.ini \
-        testdata/board-mappings.ini \
+
+test_data_boardmappings_d.files = \
+        testdata/board-mappings.ini \
\ No newline at end of file
diff --git a/tests/ut_ssuurlresolver/ut_ssuurlresolver.pro b/tests/ut_ssuurlresolver/ut_ssuurlresolver.pro
index 6f7391b..ca30e4e 100644
--- a/tests/ut_ssuurlresolver/ut_ssuurlresolver.pro
+++ b/tests/ut_ssuurlresolver/ut_ssuurlresolver.pro
@@ -6,16 +6,18 @@ CONFIG += link_pkgconfig
 PKGCONFIG += libzypp
 
 HEADERS = \
-	ssuurlresolvertest.h \
+        ssuurlresolvertest.h \
 
 SOURCES = \
         main.cpp \
-	ssuurlresolvertest.cpp \
+        ssuurlresolvertest.cpp \
 
 test_data_etc.files = \
-	testdata/ssu.ini \
+        testdata/ssu.ini \
 
 test_data_usr_share.files = \
-	testdata/ssu-defaults.ini \
-	testdata/repos.ini \
-	testdata/board-mappings.ini \
+        testdata/ssu-defaults.ini \
+        testdata/repos.ini \
+
+test_data_boardmappings_d.files = \
+        testdata/board-mappings.ini \
\ No newline at end of file
diff --git a/tests/ut_urlresolver/ut_urlresolver.pro b/tests/ut_urlresolver/ut_urlresolver.pro
index 8dee25c..81d71de 100644
--- a/tests/ut_urlresolver/ut_urlresolver.pro
+++ b/tests/ut_urlresolver/ut_urlresolver.pro
@@ -13,9 +13,11 @@ test_data.files = \
         testdata/mykey.key \
 
 test_data_etc.files = \
-	testdata/ssu.ini \
+        testdata/ssu.ini \
 
 test_data_usr_share.files = \
-	testdata/ssu-defaults.ini \
-	testdata/repos.ini \
-	testdata/board-mappings.ini \
+        testdata/ssu-defaults.ini \
+        testdata/repos.ini \
+
+test_data_boardmappings_d.files = \
+        testdata/board-mappings.ini \