2 files changed, 14 insertions, 8 deletions

diff --git a/ext/IPC/SysV/t/msg.t b/ext/IPC/SysV/t/msg.t
index fde699c301..e9e241b509 100755
--- a/ext/IPC/SysV/t/msg.t
+++ b/ext/IPC/SysV/t/msg.t
@@ -27,8 +27,9 @@ use IPC::Msg;
 
 print "1..9\n";
 
-$msq = new IPC::Msg(IPC_PRIVATE, S_IRWXU | S_IRWXG | S_IRWXO)
-	|| die "msgget: ",$!+0," $!\n";
+my $msq =
+    new IPC::Msg(IPC_PRIVATE, S_IRWXU | S_IRWXG | S_IRWXO)
+    || die "msgget: ",$!+0," $!\n";
 	
 print "ok 1\n";
 
@@ -58,5 +59,7 @@ print "ok 7\n";
 print "not " unless $ds && $ds->qnum() == 0;
 print "ok 8\n";
 
-$msq->remove || print "not ";
-print "ok 9\n";
+END {
+	(defined $msq && $msq->remove) || print "not ";
+	print "ok 9\n";
+}
diff --git a/ext/IPC/SysV/t/sem.t b/ext/IPC/SysV/t/sem.t
index b3c813c428..d506519804 100755
--- a/ext/IPC/SysV/t/sem.t
+++ b/ext/IPC/SysV/t/sem.t
@@ -35,8 +35,9 @@ use IPC::Semaphore;
 
 print "1..10\n";
 
-$sem = new IPC::Semaphore(IPC_PRIVATE, 10, S_IRWXU | S_IRWXG | S_IRWXO | IPC_CREAT)
-	|| die "semget: ",$!+0," $!\n";
+my $sem =
+    new IPC::Semaphore(IPC_PRIVATE, 10, S_IRWXU | S_IRWXG | S_IRWXO | IPC_CREAT)
+    || die "semget: ",$!+0," $!\n";
 
 print "ok 1\n";
 
@@ -68,5 +69,7 @@ print "ok 8\n";
 print "not " if $sem->getncnt(0);
 print "ok 9\n";
 
-$sem->remove || print "not ";
-print "ok 10\n";
+END {
+	(defined $sem && $sem->remove) || print "not ";
+	print "ok 10\n";
+}