diff --git a/Sources/Backends/Vulkan/VulkanImage.c b/Sources/Backends/Vulkan/VulkanImage.c
index e05fe6e..65b9c09 100644
--- a/Sources/Backends/Vulkan/VulkanImage.c
+++ b/Sources/Backends/Vulkan/VulkanImage.c
@@ -122,7 +122,7 @@ PulseImage VulkanCreateImage(PulseDevice device, const PulseImageCreateInfo* cre
 
 	VkImageCreateInfo image_create_info = { 0 };
 	image_create_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
-	image_create_info.imageType = VK_IMAGE_TYPE_2D;
+	image_create_info.imageType = create_infos->type == PULSE_IMAGE_TYPE_3D ? VK_IMAGE_TYPE_3D : VK_IMAGE_TYPE_2D;
 	image_create_info.extent.width = create_infos->width;
 	image_create_info.extent.height = create_infos->height;
 	image_create_info.extent.depth = depth;
diff --git a/Tests/Image.c b/Tests/Image.c
index cebfd8a..50a48dd 100644
--- a/Tests/Image.c
+++ b/Tests/Image.c
@@ -35,11 +35,6 @@ void TestImageCreation()
 		PulseDestroyImage(device, image);
 	}
 
-	/**
-	 * This test may crash some Nouveau NVK drivers (wtf ???).
-	 * It seems to be comming exclusively from 3D read-only images
-	 */
-	#ifndef VULKAN_ENABLED
 	{
 		PulseImageCreateInfo image_create_info = { 0 };
 		image_create_info.type = PULSE_IMAGE_TYPE_3D;
@@ -52,7 +47,6 @@ void TestImageCreation()
 		TEST_ASSERT_NOT_EQUAL_MESSAGE(image, PULSE_NULL_HANDLE, PulseVerbaliseErrorType(PulseGetLastErrorType()));
 		PulseDestroyImage(device, image);
 	}
-	#endif
 
 	{
 		PulseImageCreateInfo image_create_info = { 0 };
diff --git a/Tests/main.c b/Tests/main.c
index d2557a5..abde768 100644
--- a/Tests/main.c
+++ b/Tests/main.c
@@ -60,7 +60,7 @@
 		ZeroMemory(&line, sizeof(IMAGEHLP_LINE64));
 		line.SizeOfStruct = sizeof(IMAGEHLP_LINE64);
 
-		for (USHORT i = 0; i < frames; i++)
+		for(USHORT i = 0; i < frames; i++)
 		{
 			DWORD64 address = (DWORD64)(stack[i]);
 			if(SymFromAddr(process, address, 0, symbol))