diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
new file mode 100644
index 0000000..ced2850
--- /dev/null
+++ b/.github/workflows/code-checks.yml
@@ -0,0 +1,17 @@
+name: Format Check
+on: [pull_request]
+jobs:
+  formatting-check:
+    name: Clang Format Check
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        path: [ 'tests', 'include' ]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Run clang-format style check
+        uses: surge-synthesizer/sst-githubactions/clang-format-check@main
+        with:
+          path: ${{ matrix.path }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b442bd..6814ab6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,7 @@ if (${SST_BASIC_BLOCKS_BUILD_TESTS})
     endif ()
 
     target_link_libraries(sst-basic-blocks-test PRIVATE fmt ${PROJECT_NAME})
+    target_include_directories(sst-basic-blocks-test PRIVATE libs/catch2)
 
     if ((DEFINED ${CMAKE_OSX_DEPLOYMENT_TARGET}) AND ("${CMAKE_OSX_DEPLOYMENT_TARGET}" VERSION_LESS "10.12"))
         message(STATUS "Deactivating exceptions for ${CMAKE_OSX_DEPLOYMENT_TARGET} catch library")
diff --git a/tests/catch2.hpp b/libs/catch2/catch2.hpp
similarity index 100%
rename from tests/catch2.hpp
rename to libs/catch2/catch2.hpp