diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 80d23cf..13a5cb7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
           xmake -y -vv -j$(nproc)
 
       - name: Test
-        run: xmake run templates_test
+        run: xmake run primitives_test
 
       - name: Run examples
         run: xmake run basic
@@ -90,7 +90,7 @@ jobs:
           xmake -y -vv -j$env:NUMBER_OF_PROCESSORS
 
       - name: Test
-        run: xmake run templates_test
+        run: xmake run primitives_test
 
       - name: Run examples
         run: xmake run basic
diff --git a/tests/xmake.lua b/tests/xmake.lua
index d113570..fd1d671 100644
--- a/tests/xmake.lua
+++ b/tests/xmake.lua
@@ -6,7 +6,7 @@ add_requires("gtest")
 
 target("primitives_test")
     set_kind("binary")
-    add_files("*.cpp")
+    add_files("basic/*.cpp")
     add_deps("mcpplibs-primitives")
     add_packages("gtest")
     set_policy("build.c++.modules", true)
diff --git a/xmake.lua b/xmake.lua
index 31afa35..3b780dc 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -4,7 +4,7 @@ set_languages("c++23")
 
 target("mcpplibs-primitives")
     set_kind("static")
-    add_files("src/*.cppm", { public = true, install = true })
+    add_files("src/**.cppm", { public = true, install = true })
     set_policy("build.c++.modules", true)
 
 if not is_host("macosx") then