diff --git a/tools/libraries.py b/tools/libraries.py
index abd5b852cd..e5fd724a1d 100644
--- a/tools/libraries.py
+++ b/tools/libraries.py
@@ -21,8 +21,7 @@ from tools.paths import MBED_LIBRARIES,\
     CPPUTEST_PLATFORM_SRC, CPPUTEST_TESTRUNNER_SCR, CPPUTEST_LIBRARY,\
     CPPUTEST_INC, CPPUTEST_PLATFORM_INC, CPPUTEST_TESTRUNNER_INC,\
     CPPUTEST_INC_EXT
-from tools.data.support import DEFAULT_SUPPORT
-from tools.tests import TEST_MBED_LIB
+from tools.tests import TEST_MBED_LIB, DEFAULT_SUPPORT
 
 
 LIBRARIES = [
diff --git a/tools/tests.py b/tools/tests.py
index 448ab027c2..8e4db7aa99 100644
--- a/tools/tests.py
+++ b/tools/tests.py
@@ -15,9 +15,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from tools.paths import *
-from tools.data.support import DEFAULT_SUPPORT, CORTEX_ARM_SUPPORT
 from argparse import ArgumentTypeError
 from tools.utils import columnate
+from tools.targets import TARGETS
+
+DEFAULT_SUPPORT = {}
+CORTEX_ARM_SUPPORT = {}
+
+for target in TARGETS:
+    DEFAULT_SUPPORT[target.name] = target.supported_toolchains
+
+    if target.core.startswith('Cortex'):
+        CORTEX_ARM_SUPPORT[target.name] = [
+            t for t in target.supported_toolchains
+            if (t == 'ARM' or t == 'uARM')
+        ]
 
 TEST_CMSIS_LIB = join(TEST_DIR, "cmsis", "lib")
 TEST_MBED_LIB = join(TEST_DIR, "mbed", "env")