diff --git a/projects/hip-tests/catch/stress/CMakeLists.txt b/projects/hip-tests/catch/stress/CMakeLists.txt
index f69313b245..0beb263a81 100644
--- a/projects/hip-tests/catch/stress/CMakeLists.txt
+++ b/projects/hip-tests/catch/stress/CMakeLists.txt
@@ -2,6 +2,7 @@ add_custom_target(stress_test COMMAND "${CMAKE_CTEST_COMMAND}" -R "Stress_"
                               COMMENT "Build complete, now executing the stress test ...")
 
 add_subdirectory(memory)
+add_subdirectory(module)
 if(HIP_PLATFORM MATCHES "amd")
 add_subdirectory(printf)
 add_subdirectory(stream)
diff --git a/projects/hip-tests/catch/stress/module/CMakeLists.txt b/projects/hip-tests/catch/stress/module/CMakeLists.txt
new file mode 100644
index 0000000000..e6bd980002
--- /dev/null
+++ b/projects/hip-tests/catch/stress/module/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Common Tests - Test independent of all platforms
+set(TEST_SRC
+    hipModuleLoadUnload.cc
+)
+
+hip_add_exe_to_target(NAME module_stress
+                      TEST_SRC ${TEST_SRC}
+                      TEST_TARGET_NAME stress_test)
diff --git a/projects/hip-tests/catch/stress/module/hipModuleLoadUnload.cc b/projects/hip-tests/catch/stress/module/hipModuleLoadUnload.cc
new file mode 100644
index 0000000000..2cd6b7a0d0
--- /dev/null
+++ b/projects/hip-tests/catch/stress/module/hipModuleLoadUnload.cc
@@ -0,0 +1,126 @@
+/*
+   Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved.
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANNTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INNCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANNY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER INN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+ */
+
+#include <hip_test_common.hh>
+
+#include <hip/hiprtc.h>
+#include <hip/hip_runtime.h>
+
+#include <vector>
+#include <fstream>
+
+static constexpr auto saxpy{
+    R"(
+extern "C"
+__global__
+void saxpy(float a, float* x, float* y, float* out, size_t n)
+{
+    size_t tid = blockIdx.x * blockDim.x + threadIdx.x;
+    if (tid < n) {
+           out[tid] = a * x[tid] + y[tid];
+    }
+}
+)"};
+
+static constexpr size_t num_iterations = 200000; // 20K times
+
+bool CommitBCToFile(char* executable, size_t exe_size, const std::string& bit_code_file) {
+  std::fstream bc_file;
+  bc_file.open(bit_code_file, std::ios::out | std::ios::binary);
+
+  if (!bc_file) {
+    WARN("Cannot create file");;
+    return false;
+  }
+
+  bc_file.write(executable, exe_size);
+  bc_file.close();
+
+  return true;
+}
+
+void GetCodeObjectUsingRTC(size_t codeSize, std::vector<char>& code) {
+  hiprtcProgram prog;
+  hiprtcCreateProgram(&prog, saxpy, "saxpy.cu", 0, nullptr, nullptr);
+
+  hipDeviceProp_t props;
+  int device = 0;
+  HIP_CHECK(hipGetDeviceProperties(&props, device));
+#ifdef __HIP_PLATFORM_AMD__
+  std::string sarg = std::string("--gpu-architecture=") + props.gcnArchName;
+#else
+  std::string sarg = std::string("--fmad=false");
+#endif
+  const char* options[] = {sarg.c_str()};
+  hiprtcResult compileResult{hiprtcCompileProgram(prog, 1, options)};
+  size_t logSize;
+  HIPRTC_CHECK(hiprtcGetProgramLogSize(prog, &logSize));
+  if (logSize) {
+    std::string log(logSize, '\0');
+    HIPRTC_CHECK(hiprtcGetProgramLog(prog, &log[0]));
+    WARN("Log: "<< log);
+  }
+  REQUIRE(compileResult == HIPRTC_SUCCESS);
+  HIPRTC_CHECK(hiprtcGetCodeSize(prog, &codeSize));
+
+  code.resize(codeSize);
+  HIPRTC_CHECK(hiprtcGetCode(prog, code.data()));
+
+  HIPRTC_CHECK(hiprtcDestroyProgram(&prog));
+}
+
+/**
+ * Test Description
+ * ------------------------
+ *    - Compiles a kernel using hiprtc (mainly to use dynamically find gpu arch).
+ *    - Commits the compiled code object to a file.
+ *    - Run hipModuleLoad and hipModuleUnload for 20K times.
+ *
+ * Test source
+ * ------------------------
+ *    - unit/module/hipModuleLoadUnload.cc
+ *
+ * Test requirements
+ * ------------------------
+ *    - HIP_VERSION >= 6.0
+ */
+
+TEST_CASE("Stress_hipModuleLoadUnload") {
+
+  size_t code_size = 0;
+  std::vector<char> code;
+  GetCodeObjectUsingRTC(code_size, code);
+
+  std::string co_file("temp_code_object.txt");
+  if (!CommitBCToFile(code.data(), code.size(), co_file)) {
+    WARN("Could not commit CO to file ");
+    return;
+  }
+
+  for (size_t iter_idx = 0; iter_idx < num_iterations; ++iter_idx) {
+    if ((iter_idx % 2000) == 0) {
+      std::cout<<"Iteration :"<<iter_idx<<std::endl;
+      UNSCOPED_INFO("Unscoped Prints");
+    }
+
+    hipModule_t module;
+    HIP_CHECK(hipModuleLoad(&module, co_file.c_str()));
+    HIP_CHECK(hipModuleUnload(module));
+  }
+}