diff --git a/.github/workflows/code_layout.yml b/.github/workflows/code_layout.yml
index f7d846fd00d..8b5a2fd654c 100644
--- a/.github/workflows/code_layout.yml
+++ b/.github/workflows/code_layout.yml
@@ -194,11 +194,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Sip Checks
-        run: ./tests/code_layout/test_sipify.sh
+        run: ./tests/code_layout/sipify/test_sipify.sh
       - name: Sip Include Test
-        run: ./tests/code_layout/test_sip_include.sh
+        run: ./tests/code_layout/sipify/test_sip_include.sh
       - name: Sip Files Up To Date
-        run: ./tests/code_layout/test_sipfiles.sh
+        run: ./tests/code_layout/sipify/test_sipfiles.sh
 
   cppcheck_18_04:
     runs-on: ubuntu-18.04
diff --git a/tests/code_layout/sipifyheader.expected.sip b/tests/code_layout/sipify/sipifyheader.expected.sip
similarity index 99%
rename from tests/code_layout/sipifyheader.expected.sip
rename to tests/code_layout/sipify/sipifyheader.expected.sip
index 99e8e686c30..934de7a20cc 100644
--- a/tests/code_layout/sipifyheader.expected.sip
+++ b/tests/code_layout/sipify/sipifyheader.expected.sip
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * tests/code_layout/sipifyheader.h                                     *
+ * tests/code_layout/sipify/sipifyheader.h                              *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/tests/code_layout/sipifyheader.h b/tests/code_layout/sipify/sipifyheader.h
similarity index 100%
rename from tests/code_layout/sipifyheader.h
rename to tests/code_layout/sipify/sipifyheader.h
diff --git a/tests/code_layout/test_sip_include.sh b/tests/code_layout/sipify/test_sip_include.sh
similarity index 100%
rename from tests/code_layout/test_sip_include.sh
rename to tests/code_layout/sipify/test_sip_include.sh
diff --git a/tests/code_layout/test_sipfiles.sh b/tests/code_layout/sipify/test_sipfiles.sh
similarity index 100%
rename from tests/code_layout/test_sipfiles.sh
rename to tests/code_layout/sipify/test_sipfiles.sh
diff --git a/tests/code_layout/test_sipify.sh b/tests/code_layout/sipify/test_sipify.sh
similarity index 71%
rename from tests/code_layout/test_sipify.sh
rename to tests/code_layout/sipify/test_sipify.sh
index 7c7cb67f1dd..a878889fb4f 100755
--- a/tests/code_layout/test_sipify.sh
+++ b/tests/code_layout/sipify/test_sipify.sh
@@ -7,7 +7,7 @@ srcdir=$(dirname $0)/../../
 DIR=$(git -C ${srcdir} rev-parse --show-toplevel)
 
 pushd ${DIR} > /dev/null || exit
-outdiff=$(./scripts/sipify.pl tests/code_layout/sipifyheader.h | diff tests/code_layout/sipifyheader.expected.sip -)
+outdiff=$(./scripts/sipify.pl tests/code_layout/sipify/sipifyheader.h | diff tests/code_layout/sipify/sipifyheader.expected.sip -)
 popd > /dev/null || exit
 
 if [[ $outdiff ]]; then