diff --git a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpy_simple.cpp b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpy_simple.cpp
index 8ce02d6164..4aacfa866d 100644
--- a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpy_simple.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpy_simple.cpp
@@ -120,8 +120,8 @@ void simpleTest2(size_t numElements, bool usePinnedHost) {
         HIPCHECK(hipHostFree(A_h1));
         HIPCHECK(hipHostFree(A_h2));
     } else {
-        free(A_h1);
-        free(A_h2);
+        aligned_free(A_h1);
+        aligned_free(A_h2);
     }
 }
 
diff --git a/projects/clr/hipamd/tests/src/test_common.h b/projects/clr/hipamd/tests/src/test_common.h
index 73a952b0d1..dd77cd64a3 100644
--- a/projects/clr/hipamd/tests/src/test_common.h
+++ b/projects/clr/hipamd/tests/src/test_common.h
@@ -99,11 +99,15 @@ THE SOFTWARE.
 
 #ifdef _WIN64
 #include <tchar.h>
-#define aligned_alloc _aligned_malloc
+#define aligned_alloc(x,y) _aligned_malloc(y,x)
+#define aligned_free(x) _aligned_free(x)
 #define popen(x,y) _popen(x,y)
 #define pclose(x) _pclose(x)
 #define setenv(x,y,z) _putenv_s(x,y)
 #endif
+#else
+#define aligned_free(x) free(x)
+#endif
 
 // standard command-line variables:
 extern size_t N;