diff --git a/Makefile.PL b/Makefile.PL
index 05bf3ff..873a6e9 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -25,7 +25,6 @@ my %WriteMakefileArgs = (
   "TEST_REQUIRES" => {
     "ExtUtils::MakeMaker" => 0,
     "File::Spec" => 0,
-    "Test" => 0,
     "Test::More" => 0,
     "strict" => 0,
     "warnings" => 0
@@ -40,7 +39,6 @@ my %FallbackPrereqs = (
   "Exporter" => 0,
   "ExtUtils::MakeMaker" => 0,
   "File::Spec" => 0,
-  "Test" => 0,
   "Test::More" => 0,
   "XSLoader" => 0,
   "strict" => 0,
diff --git a/cpanfile b/cpanfile
index 5f8e857..375d3c0 100644
--- a/cpanfile
+++ b/cpanfile
@@ -12,7 +12,6 @@ on 'configure' => sub {
 on 'test' => sub {
     requires 'strict';
     requires 'warnings';
-    requires 'Test';
     requires 'Test::More';
 };
 
diff --git a/t/00-report-prereqs.dd b/t/00-report-prereqs.dd
index 02d70a0..276c64d 100644
--- a/t/00-report-prereqs.dd
+++ b/t/00-report-prereqs.dd
@@ -45,7 +45,6 @@ do { my $x = {
                    'requires' => {
                                    'ExtUtils::MakeMaker' => '0',
                                    'File::Spec' => '0',
-                                   'Test' => '0',
                                    'Test::More' => '0',
                                    'perl' => '5.006',
                                    'strict' => '0',
diff --git a/t/base64url.t b/t/base64url.t
index 3a240bb..5ababf9 100644
--- a/t/base64url.t
+++ b/t/base64url.t
@@ -1,11 +1,13 @@
-#!perl -w
-
 use strict;
 use warnings;
-use Test qw(plan ok skip);
+use Test::More;
 
 use MIME::Base64 qw(encode_base64url decode_base64url);
 
+if (ord("A") != 65) {
+    plan skip_all => "ASCII-centric test";
+}
+
 my @tests;
 
 while (<DATA>) {
@@ -14,15 +16,14 @@ while (<DATA>) {
     push(@tests, [split]);
 }
 
-plan tests => 2 * @tests;
-
 for (@tests) {
     my($name, $input, $output) = @$_;
-    print "# $name\n";
-    skip(ord("A") != 65 ? "ASCII-centric test" : 0, decode_base64url($input), $output);
-    skip(ord("A") != 65 ? "ASCII-centric test" : 0, encode_base64url($output), $input);
+    ok(decode_base64url($input), $output);
+    ok(encode_base64url($output), $input);
 }
 
+done_testing;
+
 __END__
 # https://github.com/ptarjan/base64url/blob/master/tests.txt
 # Name <space> Input <space> Ouput <newline>
diff --git a/t/length.t b/t/length.t
index f00dd83..d32e17e 100644
--- a/t/length.t
+++ b/t/length.t
@@ -2,49 +2,47 @@
 
 use strict;
 use warnings;
-use Test qw(plan ok);
-
-plan tests => 129;
+use Test::More tests => 129;
 
 use MIME::Base64 qw(encode_base64 encoded_base64_length decoded_base64_length);
 *elen = *encoded_base64_length;
 *dlen = *decoded_base64_length;
 
-ok(elen(""), 0);
-ok(elen("a"), 5);
-ok(elen("aa"), 5);
-ok(elen("aaa"), 5);
-ok(elen("aaaa"), 9);
-ok(elen("aaaaa"), 9);
-
-ok(elen("", ""), 0);
-ok(elen("a", ""), 4);
-ok(elen("aa", ""), 4);
-ok(elen("aaa", ""), 4);
-ok(elen("aaaa", ""), 8);
-ok(elen("aaaaa", ""), 8);
-
-ok(dlen(""), 0);
-ok(dlen("a"), 0);
-ok(dlen("aa"), 1);
-ok(dlen("aaa"), 2);
-ok(dlen("aaaa"), 3);
-ok(dlen("aaaaa"), 3);
-ok(dlen("aaaaaa"), 4);
-ok(dlen("aaaaaaa"), 5);
-ok(dlen("aaaaaaaa"), 6);
-
-ok(dlen("=aaaa"), 0);
-ok(dlen("a=aaa"), 0);
-ok(dlen("aa=aa"), 1);
-ok(dlen("aaa=a"), 2);
-ok(dlen("aaaa="), 3);
-
-ok(dlen("a\na\na a"), 3);
+is(elen(""), 0);
+is(elen("a"), 5);
+is(elen("aa"), 5);
+is(elen("aaa"), 5);
+is(elen("aaaa"), 9);
+is(elen("aaaaa"), 9);
+
+is(elen("", ""), 0);
+is(elen("a", ""), 4);
+is(elen("aa", ""), 4);
+is(elen("aaa", ""), 4);
+is(elen("aaaa", ""), 8);
+is(elen("aaaaa", ""), 8);
+
+is(dlen(""), 0);
+is(dlen("a"), 0);
+is(dlen("aa"), 1);
+is(dlen("aaa"), 2);
+is(dlen("aaaa"), 3);
+is(dlen("aaaaa"), 3);
+is(dlen("aaaaaa"), 4);
+is(dlen("aaaaaaa"), 5);
+is(dlen("aaaaaaaa"), 6);
+
+is(dlen("=aaaa"), 0);
+is(dlen("a=aaa"), 0);
+is(dlen("aa=aa"), 1);
+is(dlen("aaa=a"), 2);
+is(dlen("aaaa="), 3);
+
+is(dlen("a\na\na a"), 3);
 
 for my $i (50..100) {
     my $a = "a" x $i;
     my $a_enc = encode_base64($a);
-    ok(elen($a), length($a_enc));
-    ok(dlen($a_enc), $i);
+    is(elen($a), length($a_enc));
+    is(dlen($a_enc), $i);
 }
diff --git a/t/unicode.t b/t/unicode.t
index 7aeea38..ecb58b1 100644
--- a/t/unicode.t
+++ b/t/unicode.t
@@ -1,8 +1,7 @@
 use strict;
 use warnings;
 
-use Test;
-plan tests => 11;
+use Test::More tests => 11;
 
 require MIME::Base64;
 require MIME::QuotedPrint;