diff --git a/premake5.lua b/premake5.lua
index e1c1575a..be41f637 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -199,6 +199,7 @@ include "test/ObjLoadingTests.lua"
 include "test/ObjWritingTests.lua"
 include "test/ParserTestUtils.lua"
 include "test/ParserTests.lua"
+include "test/SystemTests.lua"
 include "test/ZoneCodeGeneratorLibTests.lua"
 include "test/ZoneCommonTests.lua"
 
@@ -212,6 +213,7 @@ group "Tests"
     ObjWritingTests:project()
     ParserTestUtils:project()
     ParserTests:project()
+    SystemTests:project()
     ZoneCodeGeneratorLibTests:project()
     ZoneCommonTests:project()
 group ""
diff --git a/test/SystemTests.lua b/test/SystemTests.lua
new file mode 100644
index 00000000..440a419b
--- /dev/null
+++ b/test/SystemTests.lua
@@ -0,0 +1,60 @@
+SystemTests = {}
+
+function SystemTests:include(includes)
+    if includes:handle(self:name()) then
+		includedirs {
+			path.join(TestFolder(), "SystemTests")
+		}
+	end
+end
+
+function SystemTests:link(links)
+	
+end
+
+function SystemTests:use()
+	
+end
+
+function SystemTests:name()
+    return "SystemTests"
+end
+
+function SystemTests:project()
+	local folder = TestFolder()
+	local includes = Includes:create()
+	local links = Links:create()
+
+	project(self:name())
+        targetdir(TargetDirectoryTest)
+		location "%{wks.location}/test/%{prj.name}"
+		kind "ConsoleApp"
+		language "C++"
+		
+		files {
+			path.join(folder, "SystemTests/**.h"), 
+			path.join(folder, "SystemTests/**.cpp")
+		}
+		
+		self:include(includes)
+		Catch2Common:include(includes)
+		Utils:include(includes)
+        ZoneLoading:include(includes)
+        ZoneWriting:include(includes)
+        ObjLoading:include(includes)
+        ObjCompiling:include(includes)
+        ObjWriting:include(includes)
+		catch2:include(includes)
+
+		Raw:use()
+
+		links:linkto(Utils)
+		links:linkto(ZoneLoading)
+		links:linkto(ZoneWriting)
+		links:linkto(ObjLoading)
+		links:linkto(ObjCompiling)
+		links:linkto(ObjWriting)
+		links:linkto(catch2)
+		links:linkto(Catch2Common)
+		links:linkall()
+end
diff --git a/test/SystemTests/.gitkeep b/test/SystemTests/.gitkeep
new file mode 100644
index 00000000..e69de29b