diff --git a/tests/check_ecmwf_attr.sh.in b/tests/check_ecmwf_attr.sh.in
index f3c64e1bdd38b231c66beacbfca48ada9ce29dfa..780d7381236c34f367d2733c922c30b4f5975b04 100755
--- a/tests/check_ecmwf_attr.sh.in
+++ b/tests/check_ecmwf_attr.sh.in
@@ -35,7 +35,7 @@ terminate () {
     # termination.
     exec 3<&-
     echo "waiting pm to terminate"
-    wait ${PM_PID}
+    wait 
     exit ${2:-99}
 }
 
diff --git a/tests/check_ecmwf_events.sh.in b/tests/check_ecmwf_events.sh.in
index 13c7feb7a4a1715b6d62c674d58c7a6bafe8e25a..40d3cc207c152b78bc011eae1da4588f06e8bb6f 100755
--- a/tests/check_ecmwf_events.sh.in
+++ b/tests/check_ecmwf_events.sh.in
@@ -35,7 +35,7 @@ terminate () {
     # termination.
     exec 3<&-
     echo "waiting pm to terminate"
-    wait ${PM_PID}
+    wait 
     exit ${2:-99}
 }
 
diff --git a/tests/check_ecmwf_handle.sh.in b/tests/check_ecmwf_handle.sh.in
index 85dca88c585acdc39206697edf161455ca4b54a6..842c7e4632baca602fcd77dd6ffba7b2c1a74c2b 100755
--- a/tests/check_ecmwf_handle.sh.in
+++ b/tests/check_ecmwf_handle.sh.in
@@ -35,7 +35,7 @@ terminate () {
     # termination.
     exec 3<&-
     echo "waiting pm to terminate"
-    wait ${PM_PID}
+    wait 
     exit ${2:-99}
 }
 
diff --git a/tests/check_pm_declare.sh.in b/tests/check_pm_declare.sh.in
index 3f95b4ef5df5c3b6f63f8e243cda3a1410ec82b6..4549a6c810b3233b0b9133a0c73b54afda64050a 100644
--- a/tests/check_pm_declare.sh.in
+++ b/tests/check_pm_declare.sh.in
@@ -61,7 +61,7 @@ terminate () {
     # termination.
     exec 3<&-
     echo "waiting pm to terminate"
-    wait ${PM_PID}
+    wait
     exit ${2:-99}	       
 }
 
diff --git a/tests/check_pm_declare_group.sh.in b/tests/check_pm_declare_group.sh.in
index b7a26fd461dff8d95dfe0818eb5a5faaa40db625..6341873e3da7c7423df2c8acad842d8be97c3e0c 100644
--- a/tests/check_pm_declare_group.sh.in
+++ b/tests/check_pm_declare_group.sh.in
@@ -59,7 +59,7 @@ terminate () {
     # termination.
     exec 3<&-
     echo "waiting pm to terminate"
-    wait ${PM_PID}
+    wait 
     exit ${2:-99}	       
 }
 
diff --git a/tests/check_pm_interlock.sh.in b/tests/check_pm_interlock.sh.in
index ef57e83fa886e74a91e25505cdca45b0ac538daa..05e84d8cfd6d35adfdfa682fbcb29ca9a251582a 100644
--- a/tests/check_pm_interlock.sh.in
+++ b/tests/check_pm_interlock.sh.in
@@ -65,7 +65,7 @@ terminate () {
     # termination.
     exec 3<&-
     echo "waiting pm to terminate"
-    wait ${PM_PID}
+    wait 
     exit ${2:-99}	       
 }
 
diff --git a/tests/check_subscribe.sh.in b/tests/check_subscribe.sh.in
index 5d733ded1b3f95f951234f790e669f6c3d3a02e8..8abefd0e79732527625c957ce5a3e1600f56e416 100644
--- a/tests/check_subscribe.sh.in
+++ b/tests/check_subscribe.sh.in
@@ -66,7 +66,7 @@ terminate () {
     # termination.
     exec 3<&-
     echo "waiting pm to terminate"
-    wait ${PM_PID}
+    wait 
     exit ${2:-99}	       
 }