diff --git a/features/storage/TESTS/kvstore/direct_access_devicekey_test/main.cpp b/features/storage/TESTS/kvstore/direct_access_devicekey_test/main.cpp
index a7582b6431..781a08fc3f 100644
--- a/features/storage/TESTS/kvstore/direct_access_devicekey_test/main.cpp
+++ b/features/storage/TESTS/kvstore/direct_access_devicekey_test/main.cpp
@@ -15,6 +15,10 @@
 * limitations under the License.
 */
 
+#ifndef COMPONENT_FLASHIAP
+#error [NOT_SUPPORTED] Target must have internal FlashIAP for this test
+#endif
+
 #include "mbed.h"
 #include <stdio.h>
 #include <string.h>
@@ -31,11 +35,6 @@
 #include "utest.h"
 #include <stdlib.h>
 
-#ifndef DEVICE_FLASH
-#error [NOT_SUPPORTED] Target must have internal FlashIAP for this test
-#endif
-
-
 using namespace utest::v1;
 using namespace mbed;