diff --git a/TESTS/mbed_hal/qspi/flash_configs/MX25R6435F_config.h b/TESTS/mbed_hal/qspi/flash_configs/MX25R6435F_config.h
index adcfc32205..ce426064c8 100644
--- a/TESTS/mbed_hal/qspi/flash_configs/MX25R6435F_config.h
+++ b/TESTS/mbed_hal/qspi/flash_configs/MX25R6435F_config.h
@@ -17,7 +17,7 @@
 #define MBED_QSPI_FLASH_MX25R6435F_H
 
 
-#define QSPI_FLASH_CHIP_STRING "MX25R6435F"
+#define QSPI_FLASH_CHIP_STRING "macronix MX25R6435F"
 
 // Command for reading status register
 #define QSPI_CMD_RDSR                           0x05
diff --git a/TESTS/mbed_hal/qspi/main.cpp b/TESTS/mbed_hal/qspi/main.cpp
index 3496660516..b05fe91153 100644
--- a/TESTS/mbed_hal/qspi/main.cpp
+++ b/TESTS/mbed_hal/qspi/main.cpp
@@ -13,11 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-#if !DEVICE_QSPI
-#error [NOT_SUPPORTED] test not supported
-#endif
-
 #include "utest/utest.h"
 #include "unity/unity.h"
 #include "greentea-client/test_env.h"
@@ -28,6 +23,10 @@
 #include "qspi_api.h"
 
 
+#if !DEVICE_QSPI || !defined(QSPI_FLASH_CHIP_STRING)
+#error [NOT_SUPPORTED] QSPI not supported for this target
+#endif
+
 using namespace utest::v1;
 
 // uncomment to enable verbose mode