tests: Use complete version from header

Change-Id: Ic194ff680af778d7221b60be14be20db57930244
diff --git a/tests/layers/vk_layer_utils.h b/tests/layers/vk_layer_utils.h
index cfad81c..7f4f9ea 100644
--- a/tests/layers/vk_layer_utils.h
+++ b/tests/layers/vk_layer_utils.h
@@ -88,8 +88,6 @@
 extern "C" {
 #endif
 
-#define VK_LAYER_API_VERSION VK_MAKE_VERSION(1, 0, VK_HEADER_VERSION)
-
 typedef enum VkStringErrorFlagBits {
     VK_STRING_ERROR_NONE = 0x00000000,
     VK_STRING_ERROR_LENGTH = 0x00000001,
diff --git a/tests/layers/wrap_objects.cpp b/tests/layers/wrap_objects.cpp
index 4cd0a77..f25ff27 100644
--- a/tests/layers/wrap_objects.cpp
+++ b/tests/layers/wrap_objects.cpp
@@ -31,7 +31,10 @@
 namespace wrap_objects {
 
 static const VkLayerProperties global_layer = {
-    "VK_LAYER_LUNARG_wrap_objects", VK_LAYER_API_VERSION, 1, "LunarG Test Layer",
+    "VK_LAYER_LUNARG_wrap_objects",
+    VK_HEADER_VERSION_COMPLETE,
+    1,
+    "LunarG Test Layer",
 };
 
 static uint32_t loader_layer_if_version = CURRENT_LOADER_LAYER_INTERFACE_VERSION;