diff --git a/.github/workflows/shelltests.yml b/.github/workflows/shelltests.yml
index d98cba81a..119f971cb 100644
--- a/.github/workflows/shelltests.yml
+++ b/.github/workflows/shelltests.yml
@@ -24,7 +24,8 @@ jobs:
         sudo cp ./rebar3 /usr/local/bin/
 
     - name: Checkout shell tests
-      run: git clone https://github.com/tsloughter/rebar3_tests
+      # FIXME: change to original repo before merge.
+      run: git clone -b ct/sys-config https://github.com/dmitrivereshchagin/rebar3_tests
 
     - name: Install and run shelltestrunner
       run: |
diff --git a/apps/rebar/src/rebar_prv_common_test.erl b/apps/rebar/src/rebar_prv_common_test.erl
index 2f981efee..200bdd374 100644
--- a/apps/rebar/src/rebar_prv_common_test.erl
+++ b/apps/rebar/src/rebar_prv_common_test.erl
@@ -307,10 +307,6 @@ select_tests(State, ProjectApps, CmdOpts, CfgOpts) ->
     Configs = lists:flatmap(fun(Filename) ->
                                 rebar_file_utils:consult_config(State, Filename)
                             end, SysConfigs),
-    %% NB: load the applications (from user directories too) to support OTP < 17
-    %% to our best ability.
-    rebar_paths:set_paths([deps, plugins], State),
-    [application:load(Application) || Config <- Configs, {Application, _} <- Config],
     rebar_utils:reread_config(Configs, [update_logger]),
 
     Opts = merge_opts(CmdOpts,CfgOpts),