diff --git a/build_tools/rocksdb-lego-determinator b/build_tools/rocksdb-lego-determinator
index dc32b84df..644d80b54 100755
--- a/build_tools/rocksdb-lego-determinator
+++ b/build_tools/rocksdb-lego-determinator
@@ -40,13 +40,23 @@ PARALLEL_UNIT_TEST_COMMANDS="[
             $CLEANUP_ENV,
             {
                 'name':'Build and test RocksDB debug version',
-                'shell':'$SHM $DEBUG make check 2>&1 > /dev/null || cat t/log-*',
+                'shell':'$DEBUG make -j$(nproc) all && $SHM make check > /dev/null 2>&1',
+                'user':'root'
+            },
+            {
+                'name':'Print logs',
+                'shell':'cat t/log-*',
                 'user':'root'
             },
             $CLEANUP_ENV,
             {
                 'name':'Build and test RocksDB debug version under gcc-4.8.1',
-                'shell':'$SHM $GCC_481 $DEBUG make check 2>&1 > /dev/null || cat t/log-*',
+                'shell':'$GCC_481 $DEBUG make -j$(nproc) all && $SHM make check > /dev/null 2>&1',
+                'user':'root'
+            },
+            {
+                'name':'Print logs',
+                'shell':'cat t/log-*',
                 'user':'root'
             },
         ],
@@ -100,7 +110,7 @@ CLANG_UNIT_TEST_COMMANDS="[
             $CLEANUP_ENV,
             {
                 'name':'Build and test RocksDB debug',
-                'shell':'$CLANG $SHM $DEBUG make check',
+                'shell':'$CLANG $SHM $DEBUG make J=1 check',
                 'user':'root'
             },
         ],