Index: kernel/test/btree/btree1.c
===================================================================
--- kernel/test/btree/btree1.c	(revision 70b6de17d76360ed8d3b167e184fa20dc135a760)
+++ kernel/test/btree/btree1.c	(revision cce6acfce7ba5aa42cbdb62bd49db143e53fdcf4)
@@ -32,15 +32,8 @@
 #include <debug.h>
 
-#ifdef CONFIG_BENCH
-#include <arch/cycle.h>
-#endif
-
 static void *data = (void *) 0xdeadbeef;
 
-void test_btree1(void)
+char * test_btree1(void)
 {
-#ifdef CONFIG_BENCH
-	uint64_t t0 = get_cycle();
-#endif
 	btree_t t;
 	int i;
@@ -164,7 +157,5 @@
 
 	btree_print(&t);
-#ifdef CONFIG_BENCH
-	uint64_t dt = get_cycle() - t0;
-	printf("Time: %.*d cycles\n", sizeof(dt) * 2, dt);
-#endif
+	
+	return NULL;
 }
Index: kernel/test/btree/btree1.def
===================================================================
--- kernel/test/btree/btree1.def	(revision cce6acfce7ba5aa42cbdb62bd49db143e53fdcf4)
+++ kernel/test/btree/btree1.def	(revision cce6acfce7ba5aa42cbdb62bd49db143e53fdcf4)
@@ -0,0 +1,6 @@
+{
+	"btree1",
+	"Test B-tree operations",
+	&test_btree1,
+	true
+},