diff --git a/tests/ut_deviceinfo/deviceinfotest.cpp b/tests/ut_deviceinfo/deviceinfotest.cpp
index 8c00969..a01320e 100644
--- a/tests/ut_deviceinfo/deviceinfotest.cpp
+++ b/tests/ut_deviceinfo/deviceinfotest.cpp
@@ -26,6 +26,17 @@ void DeviceInfoTest::testAdaptationVariables()
     QCOMPARE(repoName, QString("adaptation"));
 }
 
+void DeviceInfoTest::testFeatureVariables()
+{
+    SsuDeviceInfo deviceInfo("N950");
+    QHash<QString, QString> featureVariables;
+    QString repoName = deviceInfo.adaptationVariables("feature1", &featureVariables);
+    QHash<QString, QString> featureVariablesExpected;
+    featureVariablesExpected["feature"] = "test";
+    QCOMPARE(featureVariables, featureVariablesExpected);
+    QCOMPARE(repoName, QString("feature1"));
+}
+
 void DeviceInfoTest::testDeviceUid()
 {
     QVERIFY2(!SsuDeviceInfo().deviceUid().isEmpty(), "No method to get device UID on this platform");
diff --git a/tests/ut_deviceinfo/deviceinfotest.h b/tests/ut_deviceinfo/deviceinfotest.h
index bd71fe6..b4f3396 100644
--- a/tests/ut_deviceinfo/deviceinfotest.h
+++ b/tests/ut_deviceinfo/deviceinfotest.h
@@ -16,6 +16,7 @@ class DeviceInfoTest: public QObject
 
 private slots:
     void testAdaptationVariables();
+    void testFeatureVariables();
     void testDeviceUid();
     void testVariableSection();
     void testValue();
diff --git a/tests/ut_deviceinfo/testdata/board-mappings.ini b/tests/ut_deviceinfo/testdata/board-mappings.ini
index e651055..79640df 100644
--- a/tests/ut_deviceinfo/testdata/board-mappings.ini
+++ b/tests/ut_deviceinfo/testdata/board-mappings.ini
@@ -16,6 +16,7 @@ N950=N9
 family=n950-n9
 adaptation-repos=n9xx-common,n950-n9
 variables = n9
+repository-specific-variables=N9-feature1
 
 [var-n9]
 foo-n9 = foo-n9-val
@@ -49,3 +50,7 @@ bar2 = bar2Val
 
 [var-baz]
 variables = foo, bar
+
+[var-N9-feature1]
+feature=test
+