diff --git a/tests/test.cpp b/tests/test.cpp
index 676e33b351..5e05c09423 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -441,7 +441,7 @@ void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
             "print the test case names, run them",
             wxCMD_LINE_VAL_NONE, 0 },
         { wxCMD_LINE_SWITCH, "t", "timing",
-            "print names and mesure running time of individual test, run them",
+            "print names and measure running time of individual test, run them",
             wxCMD_LINE_VAL_NONE, 0 },
         { wxCMD_LINE_OPTION, "", "locale",
             "locale to use when running the program",
@@ -530,8 +530,17 @@ int TestApp::OnRun()
 
     if ( m_registries.empty() )
     {
-        // run or list all tests
+        // run or list all tests which use the CPPUNIT_TEST_SUITE_REGISTRATION() macro
+        // (i.e. those registered in the "All tests" registry); if there are other
+        // tests not registered with the CPPUNIT_TEST_SUITE_REGISTRATION() macro
+        // then they won't be listed/run!
         AddTest(runner, TestFactoryRegistry::getRegistry().makeTest());
+
+        if (m_list)
+        {
+            cout << "\nNote that the list above is not complete as it doesn't include the \n";
+            cout << "tests disabled by default.\n";
+        }
     }
     else // run only the selected tests
     {
diff --git a/tests/uris/ftp.cpp b/tests/uris/ftp.cpp
index 671b606b8b..67ccec84b9 100644
--- a/tests/uris/ftp.cpp
+++ b/tests/uris/ftp.cpp
@@ -75,8 +75,9 @@ private:
     DECLARE_NO_COPY_CLASS(FTPTestCase)
 };
 
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( FTPTestCase );
+// NOTE: we do not run FTPTestCase suite by default because buildslaves typically
+//       do not have FTP connectivity enabled by default...
+//CPPUNIT_TEST_SUITE_REGISTRATION( FTPTestCase );
 
 // also include in it's own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( FTPTestCase, "FTPTestCase" );