diff --git a/tests/src/p2p/hipPeerToPeer_simple.cpp b/tests/src/p2p/hipPeerToPeer_simple.cpp
index 32cab371b8..c279658b5a 100644
--- a/tests/src/p2p/hipPeerToPeer_simple.cpp
+++ b/tests/src/p2p/hipPeerToPeer_simple.cpp
@@ -397,32 +397,30 @@ int main(int argc, char *argv[])
     if (gpuCount < 2)
     {
         printf("P2P application requires atleast 2 gpu devices\n");
-        return 0;
-    }
+    } else {
+        if (p_tests & 0x100) {
+            testPeerHostToDevice(false/*useAsyncCopy*/);
+        }
+        testPeerHostToDevice(true/*useAsyncCopy*/);
 
-    if (p_tests & 0x100) {
-        testPeerHostToDevice(false/*useAsyncCopy*/);
-    }
-    testPeerHostToDevice(true/*useAsyncCopy*/);
+        if (p_tests & 0x1) {
+            enablePeerFirst(false/*useAsyncCopy*/);
+        }
 
-    if (p_tests & 0x1) {
-        enablePeerFirst(false/*useAsyncCopy*/);
-    }
+        if (p_tests & 0x2) {
+            allocMemoryFirst(false/*useAsyncCopy*/);
+        }
 
-    if (p_tests & 0x2) {
-        allocMemoryFirst(false/*useAsyncCopy*/);
-    }
+        if (p_tests & 0x4) {
+            simpleNegative();
+        }
 
-    if (p_tests & 0x4) {
-        simpleNegative();
+        if (p_tests & 0x8) {
+            enablePeerFirst(true/*useAsyncCopy*/);
+        }
+        if (p_tests & 0x10) {
+            allocMemoryFirst(true/*useAsyncCopy*/);
+        }
     }
-
-    if (p_tests & 0x8) {
-        enablePeerFirst(true/*useAsyncCopy*/);
-    }
-    if (p_tests & 0x10) {
-        allocMemoryFirst(true/*useAsyncCopy*/);
-    }
-
     passed();
 }