diff --git a/tools/export/uvision/__init__.py b/tools/export/uvision/__init__.py
index 4a2a114ed2..df8d3e6a8b 100644
--- a/tools/export/uvision/__init__.py
+++ b/tools/export/uvision/__init__.py
@@ -316,7 +316,7 @@ class UvisionArmc5(Uvision):
     def is_target_supported(cls, target_name):
         target = TARGET_MAP[target_name]
         if not (set(target.supported_toolchains).intersection(
-                set(["ARM", "uARM"]))):
+                set(["ARMC5", "uARM"]))):
             return False
         if not DeviceCMSIS.check_supported(target_name):
             return False
@@ -339,7 +339,7 @@ class UvisionArmc6(Uvision):
     def is_target_supported(cls, target_name):
         target = TARGET_MAP[target_name]
         if not (set(target.supported_toolchains).intersection(
-                set(["ARMC6"]))):
+                set(["ARM", "ARMC6", "uARM"]))):
             return False
         if not DeviceCMSIS.check_supported(target_name):
             return False