diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
index d5a2e50..2724a71 100644
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -28,15 +28,13 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Analyze
-      uses: JacobDomagala/StaticAnalysis@master
+      uses: skrobinson/StaticAnalysis@stable-for-argparse
       with:
         clang_tidy_args: >-
           --config-file=$GITHUB_WORKSPACE/.clang-tidy
           --extra-arg=-I$GITHUB_WORKSPACE/include --extra-arg=-std=c++17
         cppcheck_args: >-
           --enable=all --inconclusive --inline-suppr
-          -i$GITHUB_WORKSPACE/test/main.cpp
-          -i$GITHUB_WORKSPACE/test/test_*.cpp
           --suppress=missingInclude
           --suppress='*:$GITHUB_WORKSPACE/test/doctest.hpp'
         init_script: tools/static_analysis_setup.sh
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 02572a0..3c502d9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -57,10 +57,3 @@ set_property(TARGET ARGPARSE PROPERTY CXX_STANDARD 17)
 
 # Set ${PROJECT_NAME} as the startup project
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ARGPARSE)
-
-file(GLOB ARGPARSE_LINT_SOURCES
-    tidy-base.cpp
-)
-ADD_EXECUTABLE(ARGPARSE_LINT ${ARGPARSE_LINT_SOURCES})
-set_target_properties(ARGPARSE_LINT PROPERTIES OUTPUT_NAME tidy-base)
-set_property(TARGET ARGPARSE_LINT PROPERTY CXX_STANDARD 17)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644
index 0000000..cff613b
--- /dev/null
+++ b/tools/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.12)
+project(argparse)
+
+file(GLOB ARGPARSE_LINT_SOURCES
+    tidy-base.cpp
+)
+ADD_EXECUTABLE(ARGPARSE_LINT ${ARGPARSE_LINT_SOURCES})
+set_target_properties(ARGPARSE_LINT PROPERTIES OUTPUT_NAME tidy-base)
+set_property(TARGET ARGPARSE_LINT PROPERTY CXX_STANDARD 17)
+INCLUDE_DIRECTORIES("../include" ".")
diff --git a/tools/static_analysis_setup.sh b/tools/static_analysis_setup.sh
index cd0dc06..350eb82 100755
--- a/tools/static_analysis_setup.sh
+++ b/tools/static_analysis_setup.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-# Change to the "test" subdir before "build" subdir is made.
-cd test
+# Change to the "tools" subdir before "build" subdir is made.
+cd tools
diff --git a/test/tidy-base.cpp b/tools/tidy-base.cpp
similarity index 100%
rename from test/tidy-base.cpp
rename to tools/tidy-base.cpp