diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 343cded5..fa1fc1a6 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,24 +1,30 @@
 AUTOMAKE_OPTIONS = dejagnu
 export DEJAGNU
 
-if LINUX
-# Programs that are expected across the board
-test_tools = \
-		   free \
-		   pgrep \
-		   pkill \
-		   ps \
-		   pwdx \
-		   uptime \
-		   vmstat \
-		   w \
-		   sysctl slabtop pmap kill
+# Programs that are expected across the board.
+DEJATOOL =
 
+if LINUX
+# These should be in defined in 'across the board' scope, but are
+# temporarily disabled on other than linux systems, see commit
+# 3d807ae853b8b4264da156065b34f1447658a8ba
+DEJATOOL += \
+	kill \
+	pmap \
+	slabtop \
+	sysctl
+
+DEJATOOL += \
+	free \
+	pgrep \
+	pkill \
+	ps \
+	pwdx \
+	uptime \
+	vmstat \
+	w
 endif
 
-DEJATOOL = $(test_tools)
-		
-	
 EXTRA_DIST = \
 			 free.test/free.exp \
 			 kill.test/kill.exp \