diff --git a/t/rt_21406_auto_finish.t b/t/rt_21406_auto_finish.t
index fd9ca37..e08d0f5 100644
--- a/t/rt_21406_auto_finish.t
+++ b/t/rt_21406_auto_finish.t
@@ -6,25 +6,29 @@ BEGIN {
 	$^W = 1;
 }
 
-use Test::More tests => 10;
+use Test::More tests => 11;
+use Test::NoWarnings;
 use t::lib::Test;
 
-my $dbh = connect_ok( RaiseError => 1 );
-$dbh->do("CREATE TABLE f (f1, f2, f3)");
-$dbh->do("INSERT INTO f VALUES (?, ?, ?)", {}, 'foo', 'bar', 1);
-$dbh->do("INSERT INTO f VALUES (?, ?, ?)", {}, 'foo', 'bar', 2);
-$dbh->do("INSERT INTO f VALUES (?, ?, ?)", {}, 'foo', 'bar', 3);
-$dbh->do("INSERT INTO f VALUES (?, ?, ?)", {}, 'foo', 'bar', 4);
-$dbh->do("INSERT INTO f VALUES (?, ?, ?)", {}, 'foo', 'bar', 5);
+SCOPE: {
+	my $dbh = connect_ok( RaiseError => 1 );
+	$dbh->do("CREATE TABLE f (f1, f2, f3)");
+	$dbh->do("INSERT INTO f VALUES (?, ?, ?)", {}, 'foo', 'bar', 1);
+	$dbh->do("INSERT INTO f VALUES (?, ?, ?)", {}, 'foo', 'bar', 2);
+	$dbh->do("INSERT INTO f VALUES (?, ?, ?)", {}, 'foo', 'bar', 3);
+	$dbh->do("INSERT INTO f VALUES (?, ?, ?)", {}, 'foo', 'bar', 4);
+	$dbh->do("INSERT INTO f VALUES (?, ?, ?)", {}, 'foo', 'bar', 5);
 
-my $sth1 = $dbh->prepare_cached('SELECT * FROM f ORDER BY f3', {});
-isa_ok( $sth1, 'DBI::st' );
-ok( $sth1->execute, '->execute ok' );
-is_deeply( $sth1->fetchrow_arrayref, [ 'foo', 'bar', 1 ], 'Row 1 ok' );
-is_deeply( $sth1->fetchrow_arrayref, [ 'foo', 'bar', 2 ], 'Row 2 ok' );
-my $sth2 = $dbh->prepare_cached('SELECT * FROM f ORDER BY f3', {}, 3);
-isa_ok( $sth2, 'DBI::st' );
-ok( $sth2->execute, '->execute ok' );
-is_deeply( $sth2->fetchrow_arrayref, [ 'foo', 'bar', 1 ], 'Row 1 ok' );
-is_deeply( $sth2->fetchrow_arrayref, [ 'foo', 'bar', 2 ], 'Row 2 ok' );
-ok( $sth2->finish, '->finish ok' );
+	my $sth1 = $dbh->prepare_cached('SELECT * FROM f ORDER BY f3', {});
+	isa_ok( $sth1, 'DBI::st' );
+	ok( $sth1->execute, '->execute ok' );
+	is_deeply( $sth1->fetchrow_arrayref, [ 'foo', 'bar', 1 ], 'Row 1 ok' );
+	is_deeply( $sth1->fetchrow_arrayref, [ 'foo', 'bar', 2 ], 'Row 2 ok' );
+
+	my $sth2 = $dbh->prepare_cached('SELECT * FROM f ORDER BY f3', {}, 3);
+	isa_ok( $sth2, 'DBI::st' );
+	ok( $sth2->execute, '->execute ok' );
+	is_deeply( $sth2->fetchrow_arrayref, [ 'foo', 'bar', 1 ], 'Row 1 ok' );
+	is_deeply( $sth2->fetchrow_arrayref, [ 'foo', 'bar', 2 ], 'Row 2 ok' );
+	ok( $sth2->finish, '->finish ok' );
+}