diff --git a/apps/jacobi.c b/apps/jacobi.c
index cbd7888d..cbeebcc4 100644
--- a/apps/jacobi.c
+++ b/apps/jacobi.c
@@ -28,7 +28,7 @@
 
 #include "tests.h"
 
-#if defined(START_KERNEL_JACOBI) || defined(START_CHIEFTEST)
+#if (defined(START_KERNEL_JACOBI) || defined(START_CHIEFTEST)) && defined(CONFIG_ROCKCREEK)
 
 #define MATRIX_SIZE 	256
 #define MAXVALUE 	1337
diff --git a/apps/tests.c b/apps/tests.c
index e3874886..15b28e14 100644
--- a/apps/tests.c
+++ b/apps/tests.c
@@ -127,7 +127,7 @@ static int foo(void* arg)
 }
 #endif
 
-#if defined(START_MAIL_PING) || defined(START_CHIEFTEST)
+#if (defined(START_MAIL_PING) || defined(START_CHIEFTEST)) && defined(CONFIG_ROCKCREEK)
 static int mail_ping(void* arg) {
 	int i;
 
@@ -151,7 +151,7 @@ static int mail_noise(void*arg) {
 }
 #endif
 
-#if defined(START_SVM_TEST) || defined(START_CHIEFTEST)
+#if (defined(START_SVM_TEST) || defined(START_CHIEFTEST)) && defined(CONFIG_ROCKCREEK)
 
 /* N has to be multiple of UEs */
 
@@ -328,7 +328,7 @@ static int svm_test(void *arg)
 }
 #endif
 
-#if defined(START_SVM_BENCH) || defined(START_CHIEFTEST)
+#if (defined(START_SVM_BENCH) || defined(START_CHIEFTEST)) && defined(CONFIG_ROCKCREEK)
 static int svm_bench(void *arg)
 {
 	volatile uint32_t* array = NULL;