diff --git a/source/loader/layers/validation/ur_validation_layer.hpp b/source/loader/layers/validation/ur_validation_layer.hpp
index 7a103568ca..3201a5345e 100644
--- a/source/loader/layers/validation/ur_validation_layer.hpp
+++ b/source/loader/layers/validation/ur_validation_layer.hpp
@@ -20,8 +20,8 @@ namespace ur_validation_layer {
 ///////////////////////////////////////////////////////////////////////////////
 class __urdlllocal context_t : public proxy_layer_context_t {
   public:
-    bool enableParameterValidation;
-    bool enableLeakChecking;
+    bool enableParameterValidation = false;
+    bool enableLeakChecking = false;
     logger::Logger logger;
 
     ur_dditable_t urDdiTable = {};
diff --git a/test/layers/validation/fixtures.hpp b/test/layers/validation/fixtures.hpp
index 11e2a33f24..6af67c6f00 100644
--- a/test/layers/validation/fixtures.hpp
+++ b/test/layers/validation/fixtures.hpp
@@ -12,20 +12,24 @@
 struct urTest : ::testing::Test {
 
     void SetUp() override {
-        ur_loader_config_handle_t config;
-        ASSERT_EQ(urLoaderConfigCreate(&config), UR_RESULT_SUCCESS);
-        ASSERT_EQ(urLoaderConfigEnableLayer(config, "UR_LAYER_FULL_VALIDATION"),
+        ASSERT_EQ(urLoaderConfigCreate(&loader_config), UR_RESULT_SUCCESS);
+        ASSERT_EQ(urLoaderConfigEnableLayer(loader_config,
+                                            "UR_LAYER_FULL_VALIDATION"),
                   UR_RESULT_SUCCESS);
-
         ur_device_init_flags_t device_flags = 0;
-        ASSERT_EQ(urInit(device_flags, config), UR_RESULT_SUCCESS);
-        ASSERT_EQ(urLoaderConfigRelease(config), UR_RESULT_SUCCESS);
+        ASSERT_EQ(urInit(device_flags, loader_config), UR_RESULT_SUCCESS);
+        ASSERT_EQ(urLoaderConfigRelease(loader_config), UR_RESULT_SUCCESS);
     }
 
     void TearDown() override {
+        if (loader_config) {
+            ASSERT_EQ(urLoaderConfigRelease(loader_config), UR_RESULT_SUCCESS);
+        }
         ur_tear_down_params_t tear_down_params{};
         ASSERT_EQ(urTearDown(&tear_down_params), UR_RESULT_SUCCESS);
     }
+
+    ur_loader_config_handle_t loader_config = nullptr;
 };
 
 struct valPlatformsTest : urTest {
diff --git a/test/loader/loader_config/urLoaderConfigCreate.cpp b/test/loader/loader_config/urLoaderConfigCreate.cpp
index 442f6e41dc..df1293661b 100644
--- a/test/loader/loader_config/urLoaderConfigCreate.cpp
+++ b/test/loader/loader_config/urLoaderConfigCreate.cpp
@@ -5,12 +5,18 @@
 
 #include "fixtures.hpp"
 
-struct LoaderConfigCreateTest : ::testing::Test {};
+struct LoaderConfigCreateTest : ::testing::Test {
+    void TearDown() override {
+        if (loaderConfig) {
+            ASSERT_SUCCESS(urLoaderConfigRelease(loaderConfig));
+        }
+    }
 
-TEST_F(LoaderConfigCreateTest, Success) {
     ur_loader_config_handle_t loaderConfig = nullptr;
+};
+
+TEST_F(LoaderConfigCreateTest, Success) {
     ASSERT_SUCCESS(urLoaderConfigCreate(&loaderConfig));
-    ASSERT_SUCCESS(urLoaderConfigRelease(loaderConfig));
 }
 
 TEST_F(LoaderConfigCreateTest, InvalidNullPointerLoaderConfig) {