diff --git a/projects/clr/hipamd/tests/src/hipPeerToPeer_simple.cpp b/projects/clr/hipamd/tests/src/p2p/hipPeerToPeer_simple.cpp
similarity index 98%
rename from projects/clr/hipamd/tests/src/hipPeerToPeer_simple.cpp
rename to projects/clr/hipamd/tests/src/p2p/hipPeerToPeer_simple.cpp
index 1ea594f4bb..32cab371b8 100644
--- a/projects/clr/hipamd/tests/src/hipPeerToPeer_simple.cpp
+++ b/projects/clr/hipamd/tests/src/p2p/hipPeerToPeer_simple.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 // Also serves as a template for other tests.
 
 /* HIT_START
- * BUILD: %t %s test_common.cpp
+ * BUILD: %t %s ../test_common.cpp
  * RUN: %t EXCLUDE_HIP_PLATFORM all
  * RUN: %t --memcpyWithPeer EXCLUDE_HIP_PLATFORM all
  * RUN: %t --mirrorPeers EXCLUDE_HIP_PLATFORM all
@@ -391,7 +391,14 @@ void simpleNegative()
 int main(int argc, char *argv[])
 {
     parseMyArguments(argc, argv);
+    int gpuCount;
+    HIPCHECK(hipGetDeviceCount(&gpuCount));
 
+    if (gpuCount < 2)
+    {
+        printf("P2P application requires atleast 2 gpu devices\n");
+        return 0;
+    }
 
     if (p_tests & 0x100) {
         testPeerHostToDevice(false/*useAsyncCopy*/);
diff --git a/projects/clr/hipamd/tests/src/test_common.h b/projects/clr/hipamd/tests/src/test_common.h
index 1b9744647b..c2eb0d4f4e 100644
--- a/projects/clr/hipamd/tests/src/test_common.h
+++ b/projects/clr/hipamd/tests/src/test_common.h
@@ -70,7 +70,7 @@ THE SOFTWARE.
 #define HIPCHECK(error) \
 {\
     hipError_t localError = error; \
-    if (localError != hipSuccess) { \
+    if ((localError != hipSuccess) && (localError != hipErrorPeerAccessAlreadyEnabled)){ \
       printf("%serror: '%s'(%d) from %s at %s:%d%s\n", \
           KRED,hipGetErrorString(localError), localError,\
           #error,\