diff --git a/tests/src/hipEnvVarDriver.cpp b/tests/src/hipEnvVarDriver.cpp
index 599b138565..e52aa46063 100644
--- a/tests/src/hipEnvVarDriver.cpp
+++ b/tests/src/hipEnvVarDriver.cpp
@@ -38,7 +38,10 @@ int getDeviceNumber() {
     string str;
     std::this_thread::sleep_for(std::chrono::milliseconds(10));
     if (!(in = popen("./directed_tests/hipEnvVar -c", "r"))) {
-        return 1;
+        // Check at same level
+        if (!(in = popen("./hipEnvVar -c", "r"))) {
+            return 1;
+        }
     }
     while (fgets(buff, 512, in) != NULL) {
         cout << buff;
@@ -54,7 +57,11 @@ void getDevicePCIBusNumRemote(int deviceID, char* pciBusID) {
     str += std::to_string(deviceID);
     std::this_thread::sleep_for(std::chrono::milliseconds(10));
     if (!(in = popen(str.c_str(), "r"))) {
-        exit(1);
+        // Check at same level
+        if (!(in = popen("./hipEnvVar -d ", "r"))) {
+            exit(1);
+        }
+
     }
     while (fgets(pciBusID, 100, in) != NULL) {
         cout << pciBusID;
diff --git a/tests/src/runtimeApi/event/record_event.cpp b/tests/src/runtimeApi/event/record_event.cpp
index afd6bef2ef..3eb54e1735 100644
--- a/tests/src/runtimeApi/event/record_event.cpp
+++ b/tests/src/runtimeApi/event/record_event.cpp
@@ -170,8 +170,8 @@ void runTests(int64_t numElements) {
     // for (int waitStart=0; waitStart<2; waitStart++) {
     for (int waitStart = 1; waitStart >= 0; waitStart--) {
         unsigned W = waitStart ? 0x1000 : 0;
-        test(W | 0x01, C_d, C_h, numElements, 0, waitStart, syncNone);
-        test(W | 0x02, C_d, C_h, numElements, stream, waitStart, syncNone);
+        test(W | 0x01, C_d, C_h, numElements, 0, 0, syncNone);
+        test(W | 0x02, C_d, C_h, numElements, stream, 0, syncNone);
         test(W | 0x04, C_d, C_h, numElements, 0, waitStart, syncStream);
         test(W | 0x08, C_d, C_h, numElements, stream, waitStart, syncStream);
         test(W | 0x10, C_d, C_h, numElements, 0, waitStart, syncStopEvent);