t/imapd-tls.t | 4 +++-
 t/imapd.t     | 6 +++---

diff --git a/t/imapd-tls.t b/t/imapd-tls.t
index f81959a5826da3fe5729b77a340025a9234ebc7b..6b3e179778ca3e6a7bc0a697d6403feb57352ede 100644
--- a/t/imapd-tls.t
+++ b/t/imapd-tls.t
@@ -114,7 +114,9 @@ 	ok($c->select($group), 'SELECT works');
 	ok(!(scalar $c->has_capability('STARTTLS')),
 		'starttls not advertised with IMAPS');
 	ok(!$c->starttls, "starttls fails");
-	ok($c->has_capability('COMPRESS'), 'compress advertised');
+	ok($c->has_capability('COMPRESS') ||
+		$c->has_capability('COMPRESS=DEFLATE'),
+		'compress advertised');
 	ok($c->compress, 'compression enabled with IMAPS');
 	ok(!$c->starttls, 'starttls still fails');
 	ok($c->noop, 'noop succeeds');
diff --git a/t/imapd.t b/t/imapd.t
index 0f48e905557baadd0eac5388be3609a2a4861ca1..aba3ed8230328875bfd6d7b51625143f284f6bb4 100644
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -217,8 +217,8 @@ 	ok($bs, 'got a bodystructure');
 	is(lc($bs->bodytype), 'text', '->bodytype');
 	is(lc($bs->bodyenc), '8bit', '->bodyenc');
 }
-
-is_deeply([$mic->has_capability('COMPRESS')], ['DEFLATE'], 'deflate cap');
+ok($mic->has_capability('COMPRESS') ||
+	$mic->has_capability('COMPRESS=DEFLATE'), 'deflate cap');
 SKIP: {
 	skip 'Mail::IMAPClient too old for ->compress', 2 if !$can_compress;
 	my $c = $imap_client->new(%mic_opt);
@@ -243,7 +243,7 @@ 	ok($mic && $mic->login && $mic->IsAuthenticated, "authed $name");
 	my $mb = "$ng.$first_range";
 	my $uidnext = $mic->uidnext($mb); # we'll fetch BODYSTRUCTURE on this
 	ok($uidnext, 'got uidnext for later fetch');
-	is_deeply([$mic->has_capability('IDLE')], ['IDLE'], "IDLE capa $name");
+	ok($mic->has_capability('IDLE'), "IDLE capa $name");
 	ok(!$mic->idle, "IDLE fails w/o SELECT/EXAMINE $name");
 	ok($mic->examine($mb), "EXAMINE $ng succeeds");
 	ok(my $idle_tag = $mic->idle, "IDLE succeeds on $ng");