diff --git a/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp b/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp
index b9327a9c58..804922e28c 100755
--- a/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp
+++ b/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp
@@ -127,6 +127,7 @@ int main()
     HIPCHECK(hipFree(Ad));
     HIPCHECK(hipFree(Bd));
     HIPCHECK(hipHostFree(C));
+    HIPCHECK(hipModuleUnload(Module));
     if(testStatus)
         passed();
 }
diff --git a/tests/src/runtimeApi/module/hipModuleGetGlobal.cpp b/tests/src/runtimeApi/module/hipModuleGetGlobal.cpp
old mode 100644
new mode 100755
index 5896794e90..daf693f1bf
--- a/tests/src/runtimeApi/module/hipModuleGetGlobal.cpp
+++ b/tests/src/runtimeApi/module/hipModuleGetGlobal.cpp
@@ -153,6 +153,7 @@ int main() {
         };
     }
 
+    HIP_CHECK(hipModuleUnload(Module));
     hipCtxDestroy(context);
     return 0;
 }
diff --git a/tests/src/runtimeApi/module/hipModuleOccupancyMaxPotentialActiveBlockSize.cpp b/tests/src/runtimeApi/module/hipModuleOccupancyMaxPotentialActiveBlockSize.cpp
old mode 100644
new mode 100755
index f6935d0d68..60359d5943
--- a/tests/src/runtimeApi/module/hipModuleOccupancyMaxPotentialActiveBlockSize.cpp
+++ b/tests/src/runtimeApi/module/hipModuleOccupancyMaxPotentialActiveBlockSize.cpp
@@ -49,6 +49,7 @@ int main(int argc, char* argv[]) {
     assert(gridSize != 0 && blockSize != 0);
     HIPCHECK(hipModuleOccupancyMaxActiveBlocksPerMultiprocessor(&numBlock, Function, blockSize, 0));
     assert(numBlock != 0);
+    HIPCHECK(hipModuleUnload(Module));
     HIPCHECK(hipCtxDestroy(context));
     passed();
 }
diff --git a/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp b/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp
old mode 100644
new mode 100755
index 9318d168a0..ed43366671
--- a/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp
+++ b/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp
@@ -21,6 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
+ * BUILD_CMD: tex2d_kernel.code %hc --genco %S/tex2d_kernel.cpp -o tex2d_kernel.code
  * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc rocclr
  * TEST: %t
  * HIT_END
@@ -33,9 +34,6 @@ THE SOFTWARE.
 
 #define fileName "tex2d_kernel.code"
 
-#if __HIP__
-__hip_pinned_shadow__
-#endif
 texture<float, 2, hipReadModeElementType> tex;
 bool testResult = false;
 
@@ -133,6 +131,7 @@ bool runTest(int argc, char** argv) {
     }
     hipFree(dData);
     hipFreeArray(array);
+    HIP_CHECK(hipModuleUnload(Module));
     return true;
 }
 
diff --git a/tests/src/runtimeApi/module/tex2d_kernel.cpp b/tests/src/runtimeApi/module/tex2d_kernel.cpp
old mode 100644
new mode 100755
index af5010a221..560f27e741
--- a/tests/src/runtimeApi/module/tex2d_kernel.cpp
+++ b/tests/src/runtimeApi/module/tex2d_kernel.cpp
@@ -27,10 +27,7 @@ THE SOFTWARE.
 
 #include "hip/hip_runtime.h"
 
-#if __HIP__
-__hip_pinned_shadow__
-#endif
-extern texture<float, 2, hipReadModeElementType> tex;
+texture<float, 2, hipReadModeElementType> tex;
 
 extern "C" __global__ void tex2dKernel(float* outputData, int width, int height) {
     int x = hipBlockIdx_x * hipBlockDim_x + hipThreadIdx_x;