diff --git a/utils/grlib/software/leon3/leon3_test.c b/utils/grlib/software/leon3/leon3_test.c
index 73a7a39089..32daf30ef3 100644
--- a/utils/grlib/software/leon3/leon3_test.c
+++ b/utils/grlib/software/leon3/leon3_test.c
@@ -34,17 +34,28 @@ leon3_test(int domp, int *irqmp, int mtest)
     /* report_test(TEST_REG); */
     /* if (regtest()) report_fail(FAIL_REG); */
 
-    /* report_test(TEST_MUL); */
-    /* multest(); */
+    report_test(TEST_MUL);
+    multest();
+    if (!pid) printf("Finished multest.\n");
 
-    /* report_test(TEST_DIV); */
-    /* divtest(); */
+    report_test(TEST_DIV);
+    divtest();
+    if (!pid) printf("Finished divtest.\n");
 
     /* //report_test(TEST_FPU); */
     /* //fputest(); */
 
-    /* report_test(TEST_FILL_W); */
-    /* cache_fill(4, ncpu, WORD); */
+    if (!pid) data_structures_setup();
+
+    report_test(TEST_FILL_B);
+    cache_fill(L2_WAYS, ncpu, BYTE);
+    if (!pid) printf("Finished cache_fill with BYTE granularity.\n");
+    report_test(TEST_FILL_HW);
+    cache_fill(L2_WAYS, ncpu, HALFWORD);
+    if (!pid) printf("Finished cache_fill with HALFWORD granularity.\n");
+    report_test(TEST_FILL_W);
+    cache_fill(L2_WAYS, ncpu, WORD);
+    if (!pid) printf("Finished cache_fill with WORD granularity.\n");
     
     report_test(TEST_SHARING);
     false_sharing(20, ncpu);
@@ -54,12 +65,15 @@ leon3_test(int domp, int *irqmp, int mtest)
 
     report_test(TEST_LOCK);
     test_lock(100, ncpu);
+    if (!pid) printf("Finished test_lock.\n");
 
-    /* report_test(TEST_MESI); */
-    /* mesi_test(ncpu, 1); */
+    report_test(TEST_MESI);
+    mesi_test(ncpu, 1);
+    if (!pid) printf("Finished mesi_test.\n");
 
-    /* report_test(TEST_RAND_RW); */
-    /* rand_rw(200, ncpu); */
+    report_test(TEST_RAND_RW);
+    rand_rw(200, ncpu);
+    if (!pid) printf("Finished rand_rw.\n");
     
     /* End of TESTS */