diff --git a/Jenkinsfile b/Jenkinsfile
index b9143793f4..800d6a2b57 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,3 +1,4 @@
+
 // List of targets to compile
 def targets = [
   //"LPC1768",
@@ -8,19 +9,21 @@ def targets = [
 
 // Map toolchains to compiler labels on Jenkins
 def toolchains = [
-  //ARM: "armcc",
+  ARM: "armcc",
   //IAR: "iar_arm",
   GCC_ARM: "arm-none-eabi-gcc"
   ]
 
 // Create a map of predefined build steps 
-stage "generate build steps for parallel execution"
 def parallelSteps = mbed.createParalleSteps("mbed-os", targets, toolchains)
 
 // Run build steps parallel, map as paramater
-stage "build all targets"
 mbed.compile(parallelSteps)
 
-// Run testapps, mbed-os commit hash or master as parameter
-stage "run mbed-os testapps"
-mbed.runTestApps("${env.GIT_REVISION}")
+def testApps = [
+  "mbed-os-cliapp",
+  "mbed-client-testapp"
+  ]
+
+// buildTestApps accepts array of test application names and a mbed-os commit hash as parameters
+mbed.buildTestApps(testApps, "${env.GIT_REVISION}")