diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7263a134..b361f26d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -180,7 +180,7 @@ references:
           ./test/blockstore/blockstore-test ${GTEST_ARGS}
           ./test/blobstore/blobstore-test ${GTEST_ARGS}
           ./test/cryfs/cryfs-test ${GTEST_ARGS}
-          if [ ! "$DISABLE_BROKEN_TSAN_TESTS" = true ] ; then ./test/cryfs-cli/cryfs-cli-test ${GTEST_ARGS} ; fi
+          ./test/cryfs-cli/cryfs-cli-test ${GTEST_ARGS}
         fi
   job_definition: &job_definition
     <<: *container_config
@@ -480,7 +480,7 @@ jobs:
       CXXFLAGS: "-O2 -fsanitize=thread -fno-omit-frame-pointer"
       BUILD_TYPE: "Debug"
       DISABLE_BROKEN_TSAN_TESTS: true
-      GTEST_ARGS: "--gtest_filter=-LoggingTest.LoggingAlsoWorksAfterFork:AssertTest_DebugBuild.*"
+      GTEST_ARGS: "--gtest_filter=-LoggingTest.LoggingAlsoWorksAfterFork:AssertTest_DebugBuild.*:CliTest_Setup.*:CliTest_IntegrityCheck.*:*/CliTest_WrongEnvironment.*"
       CMAKE_FLAGS: ""
       RUN_TESTS: true
   clang_tidy: