diff --git a/Tests/Backend.c b/Tests/Backend.c
index 5e45762..ddc96d2 100644
--- a/Tests/Backend.c
+++ b/Tests/Backend.c
@@ -16,7 +16,9 @@ void TestBackendSupport()
 	#elif defined(WEBGPU_ENABLED)
 		if(!PulseSupportsBackend(PULSE_BACKEND_WEBGPU, PULSE_SHADER_FORMAT_WGSL_BIT))
 	#elif defined(OPENGL_ENABLED)
-		if(!PulseSupportsBackend(PULSE_BACKEND_WEBGPU, PULSE_SHADER_FORMAT_WGSL_BIT))
+		if(!PulseSupportsBackend(PULSE_BACKEND_OPENGL, PULSE_SHADER_FORMAT_GLSL_BIT))
+	#elif defined(OPENGLES_ENABLED)
+		if(!PulseSupportsBackend(PULSE_BACKEND_OPENGL_ES, PULSE_SHADER_FORMAT_GLSL_BIT))
 	#endif
 	{
 		TEST_MESSAGE("Backend is not supported");
@@ -30,6 +32,10 @@ void TestBackendSetup()
 		PulseBackend backend = PulseLoadBackend(PULSE_BACKEND_VULKAN, PULSE_SHADER_FORMAT_SPIRV_BIT, PULSE_HIGH_DEBUG);
 	#elif defined(WEBGPU_ENABLED)
 		PulseBackend backend = PulseLoadBackend(PULSE_BACKEND_WEBGPU, PULSE_SHADER_FORMAT_WGSL_BIT, PULSE_HIGH_DEBUG);
+	#elif defined(OPENGL_ENABLED)
+		PulseBackend backend = PulseLoadBackend(PULSE_BACKEND_OPENGL, PULSE_SHADER_FORMAT_GLSL_BIT, PULSE_HIGH_DEBUG);
+	#elif defined(OPENGLES_ENABLED)
+		PulseBackend backend = PulseLoadBackend(PULSE_BACKEND_OPENGL_ES, PULSE_SHADER_FORMAT_GLSL_BIT, PULSE_HIGH_DEBUG);
 	#endif
 	TEST_ASSERT_NOT_EQUAL_MESSAGE(backend, PULSE_NULL_HANDLE, PulseVerbaliseErrorType(PulseGetLastErrorType()));
 	PulseSetDebugCallback(backend, DumbDebugCallBack);
@@ -42,12 +48,18 @@ void TestBackendAnySetup()
 		PulseBackend backend = PulseLoadBackend(PULSE_BACKEND_ANY, PULSE_SHADER_FORMAT_SPIRV_BIT, PULSE_HIGH_DEBUG);
 	#elif defined(WEBGPU_ENABLED)
 		PulseBackend backend = PulseLoadBackend(PULSE_BACKEND_ANY, PULSE_SHADER_FORMAT_WGSL_BIT, PULSE_HIGH_DEBUG);
+	#elif defined(OPENGL_ENABLED) || defined(OPENGLES_ENABLED)
+		PulseBackend backend = PulseLoadBackend(PULSE_BACKEND_ANY, PULSE_SHADER_FORMAT_GLSL_BIT, PULSE_HIGH_DEBUG);
 	#endif
 	TEST_ASSERT_NOT_EQUAL_MESSAGE(backend, PULSE_NULL_HANDLE, PulseVerbaliseErrorType(PulseGetLastErrorType()));
 	#if defined(VULKAN_ENABLED)
 		TEST_ASSERT_EQUAL(PulseGetBackendType(backend), PULSE_BACKEND_VULKAN);
 	#elif defined(WEBGPU_ENABLED)
 		TEST_ASSERT_EQUAL(PulseGetBackendType(backend), PULSE_BACKEND_WEBGPU);
+	#elif defined(OPENGL_ENABLED) || defined(OPENGLES_ENABLED)
+		PulseBackendFlags backend_type = PulseGetBackendType(backend);
+		if(backend_type != PULSE_BACKEND_OPENGL && backend_type != PULSE_BACKEND_OPENGL_ES)
+			TEST_FAIL();
 	#endif
 	PulseSetDebugCallback(backend, DumbDebugCallBack);
 	PulseUnloadBackend(backend);
@@ -59,6 +71,10 @@ void TestWrongBackendSetup()
 		PulseBackend backend = PulseLoadBackend(PULSE_BACKEND_VULKAN, PULSE_SHADER_FORMAT_MSL_BIT, PULSE_HIGH_DEBUG);
 	#elif defined(WEBGPU_ENABLED)
 		PulseBackend backend = PulseLoadBackend(PULSE_BACKEND_WEBGPU, PULSE_SHADER_FORMAT_MSL_BIT, PULSE_HIGH_DEBUG);
+	#elif defined(OPENGL_ENABLED)
+		PulseBackend backend = PulseLoadBackend(PULSE_BACKEND_OPENGL, PULSE_SHADER_FORMAT_MSL_BIT, PULSE_HIGH_DEBUG);
+	#elif defined(OPENGLES_ENABLED)
+		PulseBackend backend = PulseLoadBackend(PULSE_BACKEND_OPENGL_ES, PULSE_SHADER_FORMAT_MSL_BIT, PULSE_HIGH_DEBUG);
 	#endif
 	TEST_ASSERT_EQUAL(backend, PULSE_NULL_HANDLE);
 	PulseSetDebugCallback(backend, DumbDebugCallBack);
diff --git a/Tests/Buffer.c b/Tests/Buffer.c
index fcd7621..a1012aa 100644
--- a/Tests/Buffer.c
+++ b/Tests/Buffer.c
@@ -271,11 +271,15 @@ void TestBufferComputeWrite()
 
 	#if defined(VULKAN_ENABLED)
 		const uint8_t shader_bytecode[] = {
-			#include "Shaders/Vulkan/SimpleBufferWrite.spv.h"
+			#include "Shaders/Vulkan-OpenGL/SimpleBufferWrite.spv.h"
 		};
 	#elif defined(WEBGPU_ENABLED)
 		#define SHADER_NAME shader_bytecode
 		#include "Shaders/WebGPU/SimpleBufferWrite.wgsl.h"
+	#elif defined(OPENGL_ENABLED) || defined(OPENGLES_ENABLED)
+		const uint8_t shader_bytecode[] = {
+			#include "Shaders/Vulkan-OpenGL/SimpleBufferWrite.comp.glsl.h"
+		};
 	#endif
 
 	PulseBufferCreateInfo buffer_create_info = { 0 };
@@ -338,11 +342,15 @@ void TestBufferComputeCopy()
 
 	#if defined(VULKAN_ENABLED)
 		const uint8_t shader_bytecode[] = {
-			#include "Shaders/Vulkan/BufferCopy.spv.h"
+			#include "Shaders/Vulkan-OpenGL/BufferCopy.spv.h"
 		};
 	#elif defined(WEBGPU_ENABLED)
 		#define SHADER_NAME shader_bytecode
 		#include "Shaders/WebGPU/BufferCopy.wgsl.h"
+	#elif defined(OPENGL_ENABLED) || defined(OPENGLES_ENABLED)
+		const uint8_t shader_bytecode[] = {
+			#include "Shaders/Vulkan-OpenGL/BufferCopy.comp.glsl.h"
+		};
 	#endif
 
 	uint32_t data[256];
diff --git a/Tests/Common.c b/Tests/Common.c
index 04eb45d..34c4cec 100644
--- a/Tests/Common.c
+++ b/Tests/Common.c
@@ -24,6 +24,10 @@ void SetupPulse(PulseBackend* backend)
 		*backend = PulseLoadBackend(PULSE_BACKEND_VULKAN, PULSE_SHADER_FORMAT_SPIRV_BIT, PULSE_PARANOID_DEBUG);
 	#elif defined(WEBGPU_ENABLED)
 		*backend = PulseLoadBackend(PULSE_BACKEND_WEBGPU, PULSE_SHADER_FORMAT_WGSL_BIT, PULSE_PARANOID_DEBUG);
+	#elif defined(OPENGL_ENABLED)
+		*backend = PulseLoadBackend(PULSE_BACKEND_OPENGL, PULSE_SHADER_FORMAT_GLSL_BIT, PULSE_PARANOID_DEBUG);
+	#elif defined(OPENGLES_ENABLED)
+		*backend = PulseLoadBackend(PULSE_BACKEND_OPENGL_ES, PULSE_SHADER_FORMAT_GLSL_BIT, PULSE_PARANOID_DEBUG);
 	#endif
 	if(*backend == PULSE_NULL_HANDLE)
 	{
@@ -70,6 +74,10 @@ void LoadComputePipeline(PulseDevice device, PulseComputePipeline* pipeline, con
 		info.format = PULSE_SHADER_FORMAT_SPIRV_BIT;
 	#elif defined(WEBGPU_ENABLED)
 		info.format = PULSE_SHADER_FORMAT_WGSL_BIT;
+	#elif defined(OPENGL_ENABLED)
+		info.format = PULSE_SHADER_FORMAT_GLSL_BIT;
+	#elif defined(OPENGLES_ENABLED)
+		info.format = PULSE_SHADER_FORMAT_GLSL_BIT;
 	#endif
 	info.num_readonly_storage_images = num_readonly_storage_images;
 	info.num_readonly_storage_buffers = num_readonly_storage_buffers;
diff --git a/Tests/Pipeline.c b/Tests/Pipeline.c
index e370e5f..3145654 100644
--- a/Tests/Pipeline.c
+++ b/Tests/Pipeline.c
@@ -12,11 +12,15 @@ void TestPipelineSetup()
 
 	#if defined(VULKAN_ENABLED)
 		const uint8_t shader_bytecode[] = {
-			#include "Shaders/Vulkan/Simple.spv.h"
+			#include "Shaders/Vulkan-OpenGL/Simple.spv.h"
 		};
 	#elif defined(WEBGPU_ENABLED)
 		#define SHADER_NAME shader_bytecode
 		#include "Shaders/WebGPU/Simple.wgsl.h"
+	#elif defined(OPENGL_ENABLED) || defined(OPENGLES_ENABLED)
+		const uint8_t shader_bytecode[] = {
+			#include "Shaders/Vulkan-OpenGL/Simple.comp.glsl.h"
+		};
 	#endif
 
 	PulseComputePipeline pipeline;
@@ -53,11 +57,15 @@ void TestPipelineReadOnlyBindings()
 
 	#if defined(VULKAN_ENABLED)
 		const uint8_t shader_bytecode[] = {
-			#include "Shaders/Vulkan/ReadOnlyBindings.spv.h"
+			#include "Shaders/Vulkan-OpenGL/ReadOnlyBindings.spv.h"
 		};
 	#elif defined(WEBGPU_ENABLED)
 		#define SHADER_NAME shader_bytecode
 		#include "Shaders/WebGPU/ReadOnlyBindings.wgsl.h"
+	#elif defined(OPENGL_ENABLED) || defined(OPENGLES_ENABLED)
+		const uint8_t shader_bytecode[] = {
+			#include "Shaders/Vulkan-OpenGL/ReadOnlyBindings.comp.glsl.h"
+		};
 	#endif
 
 	PulseBufferCreateInfo buffer_create_info = { 0 };
@@ -114,11 +122,15 @@ void TestPipelineWriteOnlyBindings()
 
 	#if defined(VULKAN_ENABLED)
 		const uint8_t shader_bytecode[] = {
-			#include "Shaders/Vulkan/WriteOnlyBindings.spv.h"
+			#include "Shaders/Vulkan-OpenGL/WriteOnlyBindings.spv.h"
 		};
 	#elif defined(WEBGPU_ENABLED)
 		#define SHADER_NAME shader_bytecode
 		#include "Shaders/WebGPU/WriteOnlyBindings.wgsl.h"
+	#elif defined(OPENGL_ENABLED) || defined(OPENGLES_ENABLED)
+		const uint8_t shader_bytecode[] = {
+			#include "Shaders/Vulkan-OpenGL/WriteOnlyBindings.comp.glsl.h"
+		};
 	#endif
 
 	PulseBufferCreateInfo buffer_create_info = { 0 };
@@ -175,11 +187,15 @@ void TestPipelineReadWriteBindings()
 
 	#if defined(VULKAN_ENABLED)
 		const uint8_t shader_bytecode[] = {
-			#include "Shaders/Vulkan/ReadWriteBindings.spv.h"
+			#include "Shaders/Vulkan-OpenGL/ReadWriteBindings.spv.h"
 		};
 	#elif defined(WEBGPU_ENABLED)
 		#define SHADER_NAME shader_bytecode
 		#include "Shaders/WebGPU/ReadWriteBindings.wgsl.h"
+	#elif defined(OPENGL_ENABLED) || defined(OPENGLES_ENABLED)
+		const uint8_t shader_bytecode[] = {
+			#include "Shaders/Vulkan-OpenGL/ReadWriteBindings.comp.glsl.h"
+		};
 	#endif
 
 	PulseBufferCreateInfo buffer_create_info = { 0 };
diff --git a/Tests/xmake.lua b/Tests/xmake.lua
index 116a8f6..38ef3aa 100644
--- a/Tests/xmake.lua
+++ b/Tests/xmake.lua
@@ -1,58 +1,74 @@
-Backend = {
+local Backend = {
 	VULKAN = 1,
 	OPENGL = 2,
 	OPENGL_ES = 3,
 }
 
+local nzsl_included = false
+
 function nzsl(backend)
-	add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo")
-	add_requires("nzsl >=2023.12.31", { configs = { shared = false, nzslc = true } })
-	if is_cross() then
-		add_requires("nzsl~host", { kind = "binary", host = true })
-	end
-	-- Yoinked from NZSL xmake repo
-	rule("find_nzsl")
-		on_config(function(target)
-			import("core.project.project")
-			import("core.tool.toolchain")
-			import("lib.detect.find_tool")
-			local envs
-			if is_plat("windows") then
-				local msvc = target:toolchain("msvc")
-				if msvc and msvc:check() then
-					envs = msvc:runenvs()
-				end
-			elseif is_plat("mingw") then
-				local mingw = target:toolchain("mingw")
-				if mingw and mingw:check() then
-					envs = mingw:runenvs()
-				end
-			end
-			target:data_set("nzsl_envs", envs)
-			local nzsl = project.required_package("nzsl~host") or project.required_package("nzsl")
-			local nzsldir
-			if nzsl then
-				nzsldir = path.join(nzsl:installdir(), "bin")
-				local osenvs = os.getenvs()
-				envs = envs or {}
-				for env, values in pairs(nzsl:get("envs")) do
-					local flatval = path.joinenv(values)
-					local oldenv = envs[env] or osenvs[env]
-					if not oldenv or oldenv == "" then
-						envs[env] = flatval
-					elseif not oldenv:startswith(flatval) then
-						envs[env] = flatval .. path.envsep() .. oldenv
+	if not nzsl_included then
+		add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo")
+		add_requires("nzsl >=2023.12.31", { configs = { shared = false, nzslc = true } })
+		if is_cross() then
+			add_requires("nzsl~host", { kind = "binary", host = true })
+		end
+		-- Yoinked from NZSL xmake repo
+		rule("find_nzsl")
+			on_config(function(target)
+				import("core.project.project")
+				import("core.tool.toolchain")
+				import("lib.detect.find_tool")
+				local envs
+				if is_plat("windows") then
+					local msvc = target:toolchain("msvc")
+					if msvc and msvc:check() then
+						envs = msvc:runenvs()
+					end
+				elseif is_plat("mingw") then
+					local mingw = target:toolchain("mingw")
+					if mingw and mingw:check() then
+						envs = mingw:runenvs()
 					end
 				end
-			end
-			local nzsla = find_tool("nzsla", { version = true, paths = nzsldir, envs = envs })
-			local nzslc = find_tool("nzslc", { version = true, paths = nzsldir, envs = envs })
-			target:data_set("nzsla", nzsla)
-			target:data_set("nzslc", nzslc)
-			target:data_set("nzsl_runenv", envs)
-		end)
-	rule_end()
-	rule("nzsl_compile_shaders")
+				target:data_set("nzsl_envs", envs)
+				local nzsl = project.required_package("nzsl~host") or project.required_package("nzsl")
+				local nzsldir
+				if nzsl then
+					nzsldir = path.join(nzsl:installdir(), "bin")
+					local osenvs = os.getenvs()
+					envs = envs or {}
+					for env, values in pairs(nzsl:get("envs")) do
+						local flatval = path.joinenv(values)
+						local oldenv = envs[env] or osenvs[env]
+						if not oldenv or oldenv == "" then
+							envs[env] = flatval
+						elseif not oldenv:startswith(flatval) then
+							envs[env] = flatval .. path.envsep() .. oldenv
+						end
+					end
+				end
+				local nzsla = find_tool("nzsla", { version = true, paths = nzsldir, envs = envs })
+				local nzslc = find_tool("nzslc", { version = true, paths = nzsldir, envs = envs })
+				target:data_set("nzsla", nzsla)
+				target:data_set("nzslc", nzslc)
+				target:data_set("nzsl_runenv", envs)
+			end)
+		rule_end()
+
+		nzsl_included = true
+	end
+
+	local name = ""
+	if backend == Backend.VULKAN then
+		name = "vulkan"
+	elseif backend == Backend.OPENGL_ES then
+		name = "opengl_es"
+	else
+		name = "opengl"
+	end
+
+	rule("nzsl_compile_shaders_" .. name)
 		set_extensions(".nzsl")
 		add_deps("find_nzsl")
 		before_buildcmd_file(function(target, batchcmds, shaderfile, opt)
@@ -64,7 +80,7 @@ function nzsl(backend)
 			local argv = {}
 			if backend == Backend.VULKAN then
 				argv = { "--compile=spv-header", "--optimize" }
-			elseif backend == Backend.OPENGL then
+			elseif backend == Backend.OPENGL_ES then
 				argv = { "--compile=glsl-header", "--optimize", "--gl-version", "310", "--gl-es", "--gl-bindingmap" }
 			else
 				argv = { "--compile=glsl-header", "--optimize", "--gl-version", "310", "--gl-bindingmap" }
@@ -79,7 +95,13 @@ function nzsl(backend)
 			end
 			table.insert(argv, shaderfile)
 			batchcmds:vrunv(nzslc.program, argv, { curdir = ".", envs = runenvs })
-			local outputfile = path.join(outputdir or path.directory(shaderfile), path.basename(shaderfile) .. ".spv.h")
+			local ext = ""
+			if backend == Backend.VULKAN then
+				ext = ".spv.h"
+			else
+				ext = ".glsl.h"
+			end
+			local outputfile = path.join(outputdir or path.directory(shaderfile), path.basename(shaderfile) .. ext)
 			batchcmds:add_depfiles(shaderfile)
 			batchcmds:add_depvalues(nzslc.version)
 			batchcmds:set_depmtime(os.mtime(outputfile))
@@ -95,7 +117,7 @@ local tests = {
 			nzsl(Backend.VULKAN)
 		end,
 		custom = function()
-			add_rules("nzsl_compile_shaders")
+			add_rules("nzsl_compile_shaders_vulkan")
 			add_packages("nzsl")
 			add_files("**.nzsl")
 		end
@@ -103,10 +125,10 @@ local tests = {
 	OpenGL = {
 		option = "opengl",
 		global_custom = function()
-			nzsl(backend.OPENGL)
+			nzsl(Backend.OPENGL)
 		end,
 		custom = function()
-			add_rules("nzsl_compile_shaders")
+			add_rules("nzsl_compile_shaders_opengl")
 			add_packages("nzsl")
 			add_files("**.nzsl")
 		end
@@ -114,10 +136,10 @@ local tests = {
 	OpenGLES = {
 		option = "opengl-es",
 		global_custom = function()
-			nzsl(Backend.OpenGLES)
+			nzsl(Backend.OPENGL_ES)
 		end,
 		custom = function()
-			add_rules("nzsl_compile_shaders")
+			add_rules("nzsl_compile_shaders_opengl_es")
 			add_packages("nzsl")
 			add_files("**.nzsl")
 		end
@@ -161,7 +183,7 @@ for name, module in table.orderpairs(tests) do
 end
 
 for name, module in pairs(tests) do
-	if has_config(module.option) then
+	if has_config(module.option .. "-tests") then
 		if module.global_custom then
 			module.global_custom()
 		end