Fix parallel testing for IMAP

The script for the clean section was missing the $ Meta-character to only delete the default
mailbox when it's an exact match.

Reinstore parallel testing for more tests.

21 files changed, 82 insertions, 92 deletions

diff --git a/ext/imap/tests/bug35669.phpt b/ext/imap/tests/bug35669.phpt
index 50da33a42d..7a9372d0a0 100644
--- a/ext/imap/tests/bug35669.phpt
+++ b/ext/imap/tests/bug35669.phpt
@@ -6,39 +6,39 @@ extension_loaded('imap') or die('skip imap extension not available in this build
 ?>
 --FILE--
 <?php
-    $envelope["from"] = 'Santa <somewhere@northpole.gov>';
-        $envelope["to"]  = 'The bad smurf <bad@smurf.com>';
-        $envelope['date'] = 'Wed, 04 Jan 2006 19:24:43 -0500';
+$envelope["from"] = 'Santa <somewhere@northpole.gov>';
+$envelope["to"]  = 'The bad smurf <bad@smurf.com>';
+$envelope['date'] = 'Wed, 04 Jan 2006 19:24:43 -0500';
 
-        $multipart["type"] = TYPEMULTIPART;
-        $multipart["subtype"] = "MIXED";
-        $body[] = $multipart; //add multipart stuff
+$multipart["type"] = TYPEMULTIPART;
+$multipart["subtype"] = "MIXED";
+$body[] = $multipart; //add multipart stuff
 
-        $textpart["type"] = TYPEMULTIPART;
-        $textpart["subtype"] = "ALTERNATIVE";
-        $body[] = $textpart; //add body part
+$textpart["type"] = TYPEMULTIPART;
+$textpart["subtype"] = "ALTERNATIVE";
+$body[] = $textpart; //add body part
 
-        $plain["type"] = TYPETEXT;
-        $plain["subtype"] = "PLAIN";
-        $plain["charset"] = "iso-8859-1";
-        $plain["encoding"] = ENCQUOTEDPRINTABLE;
-        $plain["description"] = "Plaintype part of message";
-        $plain['disposition'] = "inline";
-        $plain["contents.data"] = 'See mom, it will crash';
+$plain["type"] = TYPETEXT;
+$plain["subtype"] = "PLAIN";
+$plain["charset"] = "iso-8859-1";
+$plain["encoding"] = ENCQUOTEDPRINTABLE;
+$plain["description"] = "Plaintype part of message";
+$plain['disposition'] = "inline";
+$plain["contents.data"] = 'See mom, it will crash';
 
-        $body[] = $plain; //next add plain text part
+$body[] = $plain; //next add plain text part
 
-        $html["type"] = TYPETEXT;
-        $html["subtype"] = "HTML";
-        $html["charset"] = "iso-8859-1";
-        $html["encoding"] = ENCQUOTEDPRINTABLE;
-        $html["description"] = "HTML part of message";
-        $html['disposition'] = "inline";
-        $html["contents.data"] = 'See mom, it will <b>crash</b>';
+$html["type"] = TYPETEXT;
+$html["subtype"] = "HTML";
+$html["charset"] = "iso-8859-1";
+$html["encoding"] = ENCQUOTEDPRINTABLE;
+$html["description"] = "HTML part of message";
+$html['disposition'] = "inline";
+$html["contents.data"] = 'See mom, it will <b>crash</b>';
 
-        $body[] = $html;
+$body[] = $html;
 
-        echo imap_mail_compose($envelope, $body);
+echo imap_mail_compose($envelope, $body);
 ?>
 --EXPECTF--
 Date: Wed, 04 Jan 2006 19:24:43 -0500
diff --git a/ext/imap/tests/bug77153.phpt b/ext/imap/tests/bug77153.phpt
index 359923ca83..d767ce5472 100644
--- a/ext/imap/tests/bug77153.phpt
+++ b/ext/imap/tests/bug77153.phpt
@@ -4,6 +4,8 @@ Bug #77153 (imap_open allows to run arbitrary shell commands via mailbox paramet
 <?php
 extension_loaded('imap') or die('skip imap extension not available in this build');
 ?>
+--CONFLICTS--
+defaultmailbox
 --FILE--
 <?php
 $payload = "echo 'BUG'> " . __DIR__ . '/__bug';
diff --git a/ext/imap/tests/bug80226.phpt b/ext/imap/tests/bug80226.phpt
index 36dd97cf6a..6cf4cc8a58 100644
--- a/ext/imap/tests/bug80226.phpt
+++ b/ext/imap/tests/bug80226.phpt
@@ -4,14 +4,23 @@ Bug #80226 (imap_sort() leaks sortpgm memory)
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 require_once(__DIR__.'/setup/imap_include.inc');
-$stream = imap_open(IMAP_DEFAULT_MAILBOX, IMAP_MAILBOX_USERNAME, IMAP_MAILBOX_PASSWORD);
+
+echo "Create a new mailbox for test\n";
+
+$stream = setup_test_mailbox("bug80226", 0);
 var_dump(imap_sort($stream, SORTFROM, 0));
 ?>
+--CLEAN--
+<?php
+$mailbox_suffix = 'bug80226';
+require_once(__DIR__ . '/setup/clean.inc');
+?>
 --EXPECT--
+Create a new mailbox for test
+Create a temporary mailbox and add 0 msgs
+New mailbox created
 array(0) {
 }
diff --git a/ext/imap/tests/imap_body.phpt b/ext/imap/tests/imap_body.phpt
index de07a5c579..59678ad539 100644
--- a/ext/imap/tests/imap_body.phpt
+++ b/ext/imap/tests/imap_body.phpt
@@ -7,34 +7,38 @@ Paul Sohier
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-# Might not be needed
-defaultmailbox
 --FILE--
 <?php
 
 require_once(__DIR__.'/setup/imap_include.inc');
-$stream_id = imap_open(IMAP_SERVER, IMAP_MAILBOX_USERNAME, IMAP_MAILBOX_PASSWORD) or
-    die("Cannot connect to mailbox ". IMAP_SERVER. ": " . imap_last_error());
+
+$imap_stream = setup_test_mailbox("imapbodyvalueerror", 0);
 
 try {
-    imap_body($stream_id,-1);
+    imap_body($imap_stream,-1);
 } catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
 try {
-    imap_body($stream_id,1,-1);
+    imap_body($imap_stream,1,-1);
 } catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
 
 //Access not existing
-var_dump(imap_body($stream_id, 255, FT_UID));
+var_dump(imap_body($imap_stream, 255, FT_UID));
 
-imap_close($stream_id);
+imap_close($imap_stream);
 
 ?>
+--CLEAN--
+<?php
+$mailbox_suffix = 'imapbodyvalueerror';
+require_once(__DIR__ . '/setup/clean.inc');
+?>
 --EXPECTF--
+Create a temporary mailbox and add 0 msgs
+New mailbox created
 imap_body(): Argument #2 ($message_num) must be greater than 0
 imap_body(): Argument #3 ($flags) must be a bitmask of FT_UID, FT_PEEK, and FT_INTERNAL
 
diff --git a/ext/imap/tests/imap_close_variation4.phpt b/ext/imap/tests/imap_close_variation4.phpt
index cf6f72873a..ff78ac985c 100644
--- a/ext/imap/tests/imap_close_variation4.phpt
+++ b/ext/imap/tests/imap_close_variation4.phpt
@@ -4,9 +4,6 @@ Test imap_close() function : usage variations - different ints as $flags arg
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-# It should be possible to use a custom mailbox instead of conflicting with the default one
-defaultmailbox
 --FILE--
 <?php
 /*
diff --git a/ext/imap/tests/imap_createmailbox_basic.phpt b/ext/imap/tests/imap_createmailbox_basic.phpt
index 691b535630..83dc3d0f6e 100644
--- a/ext/imap/tests/imap_createmailbox_basic.phpt
+++ b/ext/imap/tests/imap_createmailbox_basic.phpt
@@ -4,16 +4,13 @@ Test imap_createmailbox() function : basic functionality
 <?php
 require_once __DIR__.'/setup/skipif.inc';
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 echo "*** Testing imap_createmailbox() : basic functionality ***\n";
 
 require_once __DIR__.'/setup/imap_include.inc';
 
-$imap_stream = imap_open(IMAP_DEFAULT_MAILBOX, IMAP_MAILBOX_USERNAME, IMAP_MAILBOX_PASSWORD) or
-    die("Cannot connect to mailbox ". IMAP_DEFAULT_MAILBOX. ": " . imap_last_error());
+$imap_stream = setup_test_mailbox("imapcreatemailboxbasic", 0);
 
 $newname = "phpnewbox";
 
@@ -53,11 +50,13 @@ imap_close($imap_stream);
 ?>
 --CLEAN--
 <?php
-$mailbox_suffix = '';
+$mailbox_suffix = 'imapcreatemailboxbasic';
 require_once __DIR__ . '/setup/clean.inc';
 ?>
 --EXPECTF--
 *** Testing imap_createmailbox() : basic functionality ***
+Create a temporary mailbox and add 0 msgs
+New mailbox created
 Newname will be 'phpnewbox'
 Add a couple of msgs to 'phpnewbox' mailbox
 Your new mailbox 'phpnewbox' has the following status:
diff --git a/ext/imap/tests/imap_fetch_overview_basic.phpt b/ext/imap/tests/imap_fetch_overview_basic.phpt
index 4b294b06fc..ea379b1e59 100644
--- a/ext/imap/tests/imap_fetch_overview_basic.phpt
+++ b/ext/imap/tests/imap_fetch_overview_basic.phpt
@@ -4,8 +4,6 @@ Test imap_fetch_overview() function : basic functionality
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 echo "*** Testing imap_fetch_overview() : basic functionality ***\n";
@@ -13,7 +11,7 @@ echo "*** Testing imap_fetch_overview() : basic functionality ***\n";
 require_once __DIR__.'/setup/imap_include.inc';
 
 // create a new mailbox and add two new messages to it
-$stream_id = setup_test_mailbox('', 2, $mailbox, false);
+$stream_id = setup_test_mailbox('imapfetchoverviewbasic', 2, $mailbox, false);
 
 // get UID for new message
 $msg_no = imap_uid($stream_id, 1);
@@ -42,7 +40,7 @@ imap_close($stream_id);
 ?>
 --CLEAN--
 <?php
-$mailbox_suffix = '';
+$mailbox_suffix = 'imapfetchoverviewbasic';
 require_once __DIR__.'/setup/clean.inc';
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_fetch_overview_variation3.phpt b/ext/imap/tests/imap_fetch_overview_variation3.phpt
index ada23d4f2a..1ed528a173 100644
--- a/ext/imap/tests/imap_fetch_overview_variation3.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation3.phpt
@@ -4,8 +4,6 @@ Test imap_fetch_overview() function : usage variations - FT_UID option
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 /*
@@ -19,7 +17,7 @@ echo "*** Testing imap_fetch_overview() : usage variations ***\n";
 require_once __DIR__.'/setup/imap_include.inc';
 
 // Initialise required variables
-$stream_id = setup_test_mailbox('', 1); // set up temporary mailbox with one simple message
+$stream_id = setup_test_mailbox('imapfetchoverviewvar3', 1); // set up temporary mailbox with one simple message
 $msg_no = 1;
 $msg_uid = imap_uid($stream_id, $msg_no);
 
@@ -48,7 +46,7 @@ foreach($flags as $option) {
 ?>
 --CLEAN--
 <?php
-$mailbox_suffix = '';
+$mailbox_suffix = 'imapfetchoverviewvar3';
 require_once(__DIR__.'/setup/clean.inc');
 ?>
 --EXPECT--
diff --git a/ext/imap/tests/imap_fetch_overview_variation5.phpt b/ext/imap/tests/imap_fetch_overview_variation5.phpt
index 00c7602a23..6a8b6abd51 100644
--- a/ext/imap/tests/imap_fetch_overview_variation5.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation5.phpt
@@ -4,8 +4,6 @@ Test imap_fetch_overview() function : usage variations - $msg_no argument
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 /*
@@ -16,7 +14,7 @@ defaultmailbox
 echo "*** Testing imap_fetch_overview() : usage variations ***\n";
 require_once __DIR__.'/setup/imap_include.inc';
 
-$stream_id = setup_test_mailbox('', 3, $mailbox, false); // set up temp mailbox with 3 msgs
+$stream_id = setup_test_mailbox('imapfetchoverviewvar5', 3, $mailbox, false); // set up temp mailbox with 3 msgs
 
 $sequences = [
     0,
@@ -46,7 +44,7 @@ imap_errors();
 ?>
 --CLEAN--
 <?php
-$mailbox_suffix = '';
+$mailbox_suffix = 'imapfetchoverviewvar5';
 require_once(__DIR__.'/setup/clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_fetch_overview_variation6.phpt b/ext/imap/tests/imap_fetch_overview_variation6.phpt
index a779c25460..0535b3d5ac 100644
--- a/ext/imap/tests/imap_fetch_overview_variation6.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation6.phpt
@@ -4,8 +4,6 @@ Test imap_fetch_overview() function : usage variations - multipart message
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 /*
@@ -16,7 +14,7 @@ echo "*** Testing imap_fetch_overview() : usage variations ***\n";
 
 require_once __DIR__.'/setup/imap_include.inc';
 
-$stream_id = setup_test_mailbox('', 0, $mailbox); // setup temp mailbox
+$stream_id = setup_test_mailbox('imapfetchoverviewvar6', 0, $mailbox); // setup temp mailbox
 create_multipart_message($stream_id, $mailbox);
 
 // refresh msg numbers
@@ -84,7 +82,7 @@ function create_multipart_message($imap_stream, $mailbox) {
 ?>
 --CLEAN--
 <?php
-$mailbox_suffix = '';
+$mailbox_suffix = 'imapfetchoverviewvar6';
 require_once(__DIR__.'/setup/clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_fetchbody_basic.phpt b/ext/imap/tests/imap_fetchbody_basic.phpt
index c07813ef7b..d0324383ea 100644
--- a/ext/imap/tests/imap_fetchbody_basic.phpt
+++ b/ext/imap/tests/imap_fetchbody_basic.phpt
@@ -4,8 +4,6 @@ Test imap_fetchbody() function : basic functionality
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 /*           [, int $options])
@@ -19,7 +17,7 @@ require_once(__DIR__.'/setup/imap_include.inc');
 // Initialise all required variables
 
 // set up mailbox with one message
-$stream_id = setup_test_mailbox('', 1, $mailbox, false);
+$stream_id = setup_test_mailbox('imapfetchbodybasic', 1, $mailbox, false);
 
 $msg_no = 1;
 $section = '2';
@@ -59,7 +57,7 @@ var_dump( $overview[0]->seen );
 ?>
 --CLEAN--
 <?php
-$mailbox_suffix = '';
+$mailbox_suffix = 'imapfetchbodybasic';
 require_once(__DIR__.'/setup/clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_fetchbody_variation4.phpt b/ext/imap/tests/imap_fetchbody_variation4.phpt
index 2726bc7bc5..5e25dd1126 100644
--- a/ext/imap/tests/imap_fetchbody_variation4.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation4.phpt
@@ -4,8 +4,6 @@ Test imap_fetchbody() function : usage variations - FT_UID option
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 /*
@@ -18,7 +16,7 @@ echo "*** Testing imap_fetchbody() : usage variations ***\n";
 require_once(__DIR__.'/setup/imap_include.inc');
 
 // Initialise required variables
-$stream_id = setup_test_mailbox('', 1); // set up temporary mailbox with one simple message
+$stream_id = setup_test_mailbox('imapfetchbodyvar4', 1); // set up temporary mailbox with one simple message
 $msg_no = 1;
 $msg_uid = imap_uid($stream_id, $msg_no);
 $section = 1;
@@ -49,7 +47,7 @@ foreach($flags as $option) {
 ?>
 --CLEAN--
 <?php
-$mailbox_suffix = '';
+$mailbox_suffix = 'imapfetchbodyvar4';
 require_once(__DIR__.'/setup/clean.inc');
 ?>
 --EXPECT--
diff --git a/ext/imap/tests/imap_fetchbody_variation6.phpt b/ext/imap/tests/imap_fetchbody_variation6.phpt
index 037900f2fc..7889c40193 100644
--- a/ext/imap/tests/imap_fetchbody_variation6.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation6.phpt
@@ -4,8 +4,6 @@ Test imap_fetchbody() function : usage variations - $message_num arg
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 /*
@@ -18,7 +16,7 @@ echo "*** Testing imap_fetchbody() : usage variations ***\n";
 require_once(__DIR__.'/setup/imap_include.inc');
 
 //Initialise required variables
-$stream_id = setup_test_mailbox('', 3); // set up temp mailbox with  simple msgs
+$stream_id = setup_test_mailbox('imapfetchbodyvar6', 3); // set up temp mailbox with  simple msgs
 $section = 1;
 
 $sequences = [0, /* out of range */ 4, 1];
@@ -34,7 +32,7 @@ foreach($sequences as $message_num) {
 ?>
 --CLEAN--
 <?php
-$mailbox_suffix = '';
+$mailbox_suffix = 'imapfetchbodyvar6';
 require_once(__DIR__.'/setup/clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_fetchheader_basic.phpt b/ext/imap/tests/imap_fetchheader_basic.phpt
index 6027757014..dc934e00cf 100644
--- a/ext/imap/tests/imap_fetchheader_basic.phpt
+++ b/ext/imap/tests/imap_fetchheader_basic.phpt
@@ -4,8 +4,6 @@ Test imap_fetchheader() function : basic function
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 echo "*** Testing imap_fetchheader() : basic functionality ***\n";
diff --git a/ext/imap/tests/imap_fetchheader_variation3.phpt b/ext/imap/tests/imap_fetchheader_variation3.phpt
index dafe06e82c..1289087b7d 100644
--- a/ext/imap/tests/imap_fetchheader_variation3.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation3.phpt
@@ -4,8 +4,6 @@ Test imap_fetchheader() function : usage variations - FT_UID option
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 /*
diff --git a/ext/imap/tests/imap_fetchheader_variation5.phpt b/ext/imap/tests/imap_fetchheader_variation5.phpt
index 17419202e0..eb6493017b 100644
--- a/ext/imap/tests/imap_fetchheader_variation5.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation5.phpt
@@ -4,8 +4,6 @@ Test imap_fetchheader() function : usage variations - $message_num argument
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 /*
diff --git a/ext/imap/tests/imap_fetchstructure_basic.phpt b/ext/imap/tests/imap_fetchstructure_basic.phpt
index 8ecf4a5c5b..2eb730c890 100644
--- a/ext/imap/tests/imap_fetchstructure_basic.phpt
+++ b/ext/imap/tests/imap_fetchstructure_basic.phpt
@@ -6,8 +6,6 @@ Olivier Doucet
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 
diff --git a/ext/imap/tests/imap_gc_error.phpt b/ext/imap/tests/imap_gc_error.phpt
index 81b4a4bab6..7c6fa3da84 100644
--- a/ext/imap/tests/imap_gc_error.phpt
+++ b/ext/imap/tests/imap_gc_error.phpt
@@ -11,8 +11,7 @@ require_once(__DIR__.'/setup/skipif.inc');
 <?php
 
 require_once(__DIR__.'/setup/imap_include.inc');
-$stream_id = imap_open(IMAP_DEFAULT_MAILBOX, IMAP_MAILBOX_USERNAME, IMAP_MAILBOX_PASSWORD) or
-    die("Cannot connect to mailbox ". IMAP_DEFAULT_MAILBOX .": " . imap_last_error());
+$stream_id = setup_test_mailbox('imapgcerror', 1);
 
 try {
     imap_gc($stream_id, -1);
@@ -21,5 +20,12 @@ try {
 }
 
 ?>
+--CLEAN--
+<?php
+$mailbox_suffix = 'imapgcerror';
+require_once(__DIR__.'/setup/clean.inc');
+?>
 --EXPECT--
+Create a temporary mailbox and add 1 msgs
+New mailbox created
 imap_gc(): Argument #2 ($flags) must be a bitmask of IMAP_GC_TEXTS, IMAP_GC_ELT, and IMAP_GC_ENV
diff --git a/ext/imap/tests/imap_mail_move_basic.phpt b/ext/imap/tests/imap_mail_move_basic.phpt
index 4c07c85a78..e75ed2b9d2 100644
--- a/ext/imap/tests/imap_mail_move_basic.phpt
+++ b/ext/imap/tests/imap_mail_move_basic.phpt
@@ -17,9 +17,6 @@ require_once(__DIR__.'/setup/imap_include.inc');
 
 echo "Create a new mailbox for test\n";
 $imap_stream = setup_test_mailbox("", 1);
-if (!is_resource($imap_stream)) {
-    exit("TEST FAILED: Unable to create test mailbox\n");
-}
 
 $check = imap_check($imap_stream);
 echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";
diff --git a/ext/imap/tests/imap_renamemailbox_basic.phpt b/ext/imap/tests/imap_renamemailbox_basic.phpt
index f727f21729..f70f1cf149 100644
--- a/ext/imap/tests/imap_renamemailbox_basic.phpt
+++ b/ext/imap/tests/imap_renamemailbox_basic.phpt
@@ -6,6 +6,8 @@ Olivier Doucet
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
+--CONFLICTS--
+defaultmailbox
 --FILE--
 <?php
 
@@ -13,10 +15,6 @@ require_once(__DIR__.'/setup/imap_include.inc');
 
 $stream_id = setup_test_mailbox('imaprenamemailbox', 1);
 
-if (!is_resource($stream_id)) {
-    exit("TEST FAILED: Unable to create test mailbox\n");
-}
-
 $newbox = IMAP_DEFAULT_MAILBOX . "." . IMAP_MAILBOX_PHPT_PREFIX;
 
 //commented because of bug #49901
diff --git a/ext/imap/tests/setup/clean.inc b/ext/imap/tests/setup/clean.inc
index d96b7f19fe..c9ddea78c2 100644
--- a/ext/imap/tests/setup/clean.inc
+++ b/ext/imap/tests/setup/clean.inc
@@ -15,7 +15,7 @@ $mailboxes = imap_getmailboxes($imap_stream, IMAP_SERVER, '*');
 
 foreach($mailboxes as $value) {
     // Only delete mailbox with our prefix (+ optional test suffix)
-    if (preg_match('/\{.*?\}INBOX\.' . IMAP_MAILBOX_PHPT_PREFIX . $mailbox_suffix .'/', $value->name, $match) == 1) {
+    if (preg_match('/\{.*?\}INBOX\.' . IMAP_MAILBOX_PHPT_PREFIX . $mailbox_suffix .'$/', $value->name, $match) == 1) {
         imap_deletemailbox($imap_stream, $value->name);
     }
 }