diff --git a/src/rebar_ct.erl b/src/rebar_ct.erl
index 6fd5bc7..e33c6c9 100644
--- a/src/rebar_ct.erl
+++ b/src/rebar_ct.erl
@@ -65,7 +65,12 @@ run_test_if_present(TestDir, LogDir, Config, File) ->
                           ++ " SUITES - skipping\n", [TestDir]),
                     ok;
                 _ ->
-                    run_test(TestDir, LogDir, Config, File)
+                    try
+                        run_test(TestDir, LogDir, Config, File)
+                    catch
+                        throw:skip ->
+                            ok
+                    end
             end
     end.
 
@@ -270,8 +275,10 @@ find_suite_path(Suite, TestDir) ->
     Path = filename:join(TestDir, Suite ++ "_SUITE.erl"),
     case filelib:is_regular(Path) of
         false ->
-            ?ERROR("Suite ~s not found\n", [Suite]),
-            ?FAIL;
+            ?WARN("Suite ~s not found\n", [Suite]),
+            %% Note - this throw is caught in run_test_if_present/3;
+            %% this solution was easier than refactoring the entire module.
+            throw(skip);
         true ->
             Path
     end.