diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 5c4c737..b168b71 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -99,7 +99,7 @@
 
 int main( int argc, char *argv[] )
 {
-    int ret = 0, v, suites_tested = 0, suites_failed =0,
+    int ret = 0, v, suites_tested = 0, suites_failed = 0,
         exitcode = EXIT_SUCCESS;
 #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
     unsigned char buf[1000000];
@@ -376,7 +376,7 @@
 
     if( v != 0 )
     {
-        mbedtls_printf( "  Executed %d test suites\n\n", suites_tested);
+        mbedtls_printf( "  Executed %d test suites\n\n", suites_tested );
 
         if( suites_failed > 0)
         {
@@ -395,6 +395,6 @@
     if( suites_failed > 0)
         exitcode = EXIT_FAILURE;
 
-    exit(exitcode);
+    exit( exitcode );
 }
 
diff --git a/tests/scripts/basic-build-test.sh b/tests/scripts/basic-build-test.sh
index 25248d6..06c2eb9 100755
--- a/tests/scripts/basic-build-test.sh
+++ b/tests/scripts/basic-build-test.sh
@@ -94,7 +94,7 @@
 TOTAL_EXED=$(($PASSED_TESTS + $FAILED_TESTS))
 
 
-# Step 3b - Unit tests
+# Step 4b - Unit tests
 echo "Unit tests - tests/scripts/run-test-suites.pl"
 
 PASSED_TESTS=$(tail -n6 unit-test-$TEST_OUTPUT|sed -n -e 's/test cases passed :[\t]*\([0-9]*\)/\1/p'| tr -d ' ')
@@ -117,7 +117,7 @@
 TOTAL_EXED=$(($TOTAL_EXED + $PASSED_TESTS + $FAILED_TESTS))
 
 
-# Step 3c - TLS Options tests
+# Step 4c - TLS Options tests
 echo "TLS Options tests - tests/ssl-opt.sh"
 
 PASSED_TESTS=$(tail -n5 sys-test-$TEST_OUTPUT|sed -n -e 's/.* (\([0-9]*\) \/ [0-9]* tests ([0-9]* skipped))$/\1/p')
@@ -139,7 +139,7 @@
 TOTAL_EXED=$(($TOTAL_EXED + $TOTAL_TESTS))
 
 
-# Step 3d - System Compatibility tests
+# Step 4d - System Compatibility tests
 echo "System/Compatibility tests - tests/compat.sh"
 
 PASSED_TESTS=$(tail -n5 compat-test-$TEST_OUTPUT|sed -n -e 's/.* (\([0-9]*\) \/ [0-9]* tests ([0-9]* skipped))$/\1/p')
@@ -161,7 +161,7 @@
 TOTAL_EXED=$(($TOTAL_EXED + $EXED_TESTS))
 
 
-# Step 3e - Grand totals
+# Step 4e - Grand totals
 echo "-------------------------------------------------------------------------"
 echo "Total tests"
 
@@ -173,7 +173,7 @@
 echo
 
 
-# Step 3f - Coverage
+# Step 4f - Coverage
 echo "Coverage"
 
 LINES_TESTED=$(tail -n3 cov-$TEST_OUTPUT|sed -n -e 's/  lines......: [0-9]*.[0-9]% (\([0-9]*\) of [0-9]* lines)/\1/p')