Index: /trunk/src/VBox/Runtime/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Runtime/testcase/Makefile.kmk	(revision 20107)
+++ /trunk/src/VBox/Runtime/testcase/Makefile.kmk	(revision 20108)
@@ -165,6 +165,4 @@
 tstRTCritSectW32_DEFS = TRY_WIN32_CRIT
 
-tstDarwinSched_SOURCES = tstDarwinSched.cpp
-
 tstDeadlock_SOURCES = tstDeadlock.cpp
 
@@ -185,4 +183,6 @@
 
 tstFileAppendWin-1_SOURCES = tstFileAppendWin-1.cpp
+
+tstFileAio_SOURCES = tstFileAio.cpp
 
 tstFileLock_SOURCES = tstFileLock.cpp
@@ -332,4 +332,6 @@
 tstRTProcIsRunningByName_SOURCES = tstRTProcIsRunningByName.cpp
 
+tstRTS3_SOURCES = tstRTS3.cpp
+
 tstSemMutex_SOURCES = tstSemMutex.cpp
 
@@ -369,9 +371,12 @@
 tstUuid_SOURCES = tstUuid.cpp
 
-tstRTS3_SOURCES = tstRTS3.cpp
-
 tstUtf8_SOURCES = tstUtf8.cpp
 
-tstFileAio_SOURCES = tstFileAio.cpp
+
+#
+# odds and  ends
+#
+
+tstDarwinSched_SOURCES = tstDarwinSched.cpp
 
 ntGetTimerResolution_SOURCES = ntGetTimerResolution.cpp
Index: /trunk/src/VBox/Runtime/testcase/tstRTS3.cpp
===================================================================
--- /trunk/src/VBox/Runtime/testcase/tstRTS3.cpp	(revision 20107)
+++ /trunk/src/VBox/Runtime/testcase/tstRTS3.cpp	(revision 20108)
@@ -39,4 +39,8 @@
 #include <iprt/test.h>
 
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
 /* Manual configuration of this testcase */
 #define TSTS3_CREATEBUCKET
@@ -176,4 +180,16 @@
 {
     /*
+     * Initialize IPRT and create the test.
+     */
+    int rc = RTR3Init();
+    if (RT_FAILURE(rc))
+        return 1;
+    RTTEST hTest;
+    rc = RTTestCreate("tstRTS3", &hTest);
+    if (RT_FAILURE(rc))
+        return 1;
+    RTTestBanner(hTest);
+
+    /*
      * If no args, display usage.
      */
@@ -183,14 +199,4 @@
         return 1;
     }
-
-    int rc = RTR3Init();
-    if (RT_FAILURE(rc))
-        return 1;
-
-    RTTEST hTest;
-    rc = RTTestCreate("tstRTS3", &hTest);
-    if (RT_FAILURE(rc))
-        return 1;
-    RTTestBanner(hTest);
 
     RTTestSubF(hTest, "Create S3");