diff --git a/drivers/device_key/README.md b/drivers/device_key/README.md
index 8cd2eb4b9f..ac0bd0496d 100644
--- a/drivers/device_key/README.md
+++ b/drivers/device_key/README.md
@@ -42,5 +42,5 @@ To instantiate DeviceKey, you need to call its `get_instance` member function as
 Run the DeviceKey functionality test with the `mbed` command as follows:
 
 ``` 
-    ```mbed test -n features-device_key-tests-device_key-functionality```
+    ```mbed test -n drivers-device_key-tests-tests-device_key-functionality```
 ```
diff --git a/drivers/device_key/source/DeviceKey.h b/drivers/device_key/include/device_key/DeviceKey.h
similarity index 100%
rename from drivers/device_key/source/DeviceKey.h
rename to drivers/device_key/include/device_key/DeviceKey.h
diff --git a/drivers/device_key/TESTS/device_key/functionality/main.cpp b/drivers/device_key/tests/TESTS/device_key/functionality/main.cpp
similarity index 100%
rename from drivers/device_key/TESTS/device_key/functionality/main.cpp
rename to drivers/device_key/tests/TESTS/device_key/functionality/main.cpp
diff --git a/storage/kvstore/securestore/include/securestore/SecureStore.h b/storage/kvstore/securestore/include/securestore/SecureStore.h
index b4826aeaf0..6e23b67a11 100644
--- a/storage/kvstore/securestore/include/securestore/SecureStore.h
+++ b/storage/kvstore/securestore/include/securestore/SecureStore.h
@@ -23,7 +23,7 @@
 #include MBEDTLS_CONFIG_FILE
 #endif
 
-#include "features/device_key/source/DeviceKey.h"
+#include "device_key/DeviceKey.h"
 
 #define SECURESTORE_ENABLED 1