diff --git a/.circleci/config.yml b/.circleci/config.yml
index 35d5e9690..f62933179 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -472,7 +472,7 @@ jobs:
       - checkout
       - run: *run_docs_pragma_min_version
 
-  t_pyscripts_ubu:
+  t_ubu_pyscripts:
     <<: *base_ubuntu2004
     steps:
       - checkout
@@ -480,7 +480,7 @@ jobs:
           name: Python unit tests
           command: python3 test/pyscriptTests.py
 
-  t_pyscripts_win:
+  t_win_pyscripts:
     <<: *base_win_powershell
     steps:
       - run: git config --global core.autocrlf false
@@ -804,7 +804,7 @@ jobs:
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
     <<: *steps_cmdline_tests
 
-  t_ubu_asan:
+  t_ubu_asan_soltest:
     <<: *base_ubuntu2004
     parallelism: 6
     environment:
@@ -814,7 +814,7 @@ jobs:
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
     <<: *steps_soltest
 
-  t_ubu_asan_clang:
+  t_ubu_asan_clang_soltest:
     <<: *base_ubuntu2004_clang
     environment:
       EVM: << pipeline.parameters.evm-version >>
@@ -823,7 +823,7 @@ jobs:
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
     <<: *steps_soltest
 
-  t_ubu_ubsan_clang:
+  t_ubu_ubsan_clang_soltest:
     <<: *base_ubuntu2004_clang
     environment:
       EVM: << pipeline.parameters.evm-version >>
@@ -932,7 +932,7 @@ jobs:
     environment:
       FORCE_RELEASE: ON
 
-  t_win: &t_win
+  t_win_soltest: &t_win_soltest
     <<: *base_win_powershell
     steps:
       # NOTE: Git's default core.autocrlf is fine for running soltest. We get additional coverage
@@ -949,8 +949,8 @@ jobs:
       - store_test_results: *store_test_results
       - store_artifacts: *artifacts_test_results
 
-  t_win_release:
-    <<: *t_win
+  t_win_release_soltest:
+    <<: *t_win_soltest
 
   b_bytecode_ubu:
     <<: *base_ubuntu2004
@@ -1082,8 +1082,8 @@ workflows:
       - chk_errorcodes: *workflow_trigger_on_tags
       - chk_antlr_grammar: *workflow_trigger_on_tags
       - chk_docs_pragma_min_version: *workflow_trigger_on_tags
-      - t_pyscripts_ubu: *workflow_trigger_on_tags
-      - t_pyscripts_win: *workflow_trigger_on_tags
+      - t_ubu_pyscripts: *workflow_trigger_on_tags
+      - t_win_pyscripts: *workflow_trigger_on_tags
 
       # build-only
       - b_docs: *workflow_trigger_on_tags
@@ -1175,8 +1175,8 @@ workflows:
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
       - b_win_release: *workflow_trigger_on_tags
-      - t_win: *workflow_win
-      - t_win_release: *workflow_win_release
+      - t_win_soltest: *workflow_win
+      - t_win_release_soltest: *workflow_win_release
 
       # Bytecode comparison:
       - b_bytecode_ubu:
@@ -1220,13 +1220,13 @@ workflows:
       # ASan build and tests
       - b_ubu_asan: *workflow_trigger_on_tags
       - b_ubu_asan_clang: *workflow_trigger_on_tags
-      - t_ubu_asan: *workflow_ubuntu2004_asan
-      - t_ubu_asan_clang: *workflow_ubuntu2004_asan_clang
+      - t_ubu_asan_soltest: *workflow_ubuntu2004_asan
+      - t_ubu_asan_clang_soltest: *workflow_ubuntu2004_asan_clang
       - t_ubu_asan_cli: *workflow_ubuntu2004_asan
 
       # UBSan build and tests
       - b_ubu_ubsan_clang: *workflow_trigger_on_tags
-      - t_ubu_ubsan_clang: *workflow_ubuntu2004_ubsan_clang
+      - t_ubu_ubsan_clang_soltest: *workflow_ubuntu2004_ubsan_clang
       - t_ubu_ubsan_clang_cli: *workflow_ubuntu2004_ubsan_clang
 
       # Emscripten build and tests that take more than 15 minutes to execute