5 files changed, 11 insertions, 79 deletions
diff --git a/t/01compile.t b/t/01compile.t
index 727112a3..2b81d0c3 100644
--- a/t/01compile.t
+++ b/t/01compile.t
@@ -2,14 +2,10 @@
 
 use strict;
 use warnings;
+use Test::More tests => 26;
 
-use English qw(-no_match_vars);
-use Test::More;
-
-eval {
-    require Test::Compile;
-    Test::Compile->import();
-};
-plan(skip_all => 'Test::Compile required') if $EVAL_ERROR;
-
-all_pm_files_ok(all_pm_files('urpm'));
+for my $module (glob("urpm/*.pm")) {
+    $module =~ s,/,::,g;
+    $module =~ s,\.pm$,,;
+    use_ok $module;
+}
diff --git a/t/pod-coverage.t b/t/pod-coverage.t
deleted file mode 100644
index c6444cf6..00000000
--- a/t/pod-coverage.t
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-use lib 'urpm';
-
-use English qw(-no_match_vars);
-use Test::More;
-
-plan(skip_all => 'Author test, set $ENV{TEST_AUTHOR} to a true value to run')
-    if !$ENV{TEST_AUTHOR};
-
-eval {
-    require Test::Pod::Coverage;
-    Test::Pod::Coverage->import();
-};
-plan(skip_all => 'Test::Pod::Coverage required') if $EVAL_ERROR;
-
-my @modules = all_modules('urpm');
-
-plan tests => scalar @modules;
-
-foreach my $module (@modules) {
-    pod_coverage_ok(
-        $module,
-    );
-}
diff --git a/t/pod-spelling.t b/t/pod-spelling.t
deleted file mode 100644
index 90e36e48..00000000
--- a/t/pod-spelling.t
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-use Test::More;
-
-plan(skip_all => 'Author test, set $ENV{TEST_AUTHOR} to a true value to run')
-    if !$ENV{TEST_AUTHOR};
-
-eval {
-    require Test::Pod;
-    Test::Pod->import();
-};
-plan(skip_all => 'Test::Pod required') if $EVAL_ERROR;
-
-eval {
-    require Test::Pod::Spelling::CommonMistakes;
-    Test::Pod::Spelling::CommonMistakes->import();
-};
-plan(skip_all => 'Test::Pod::Spelling::CommonMistakes required') if $EVAL_ERROR;
-
-all_pod_files_ok(all_pod_files('urpm'));
diff --git a/t/pod-syntax.t b/t/pod-syntax.t
deleted file mode 100644
index 85a7158e..00000000
--- a/t/pod-syntax.t
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-use Test::More;
-
-plan(skip_all => 'Author test, set $ENV{TEST_AUTHOR} to a true value to run')
-    if !$ENV{TEST_AUTHOR};
-
-eval {
-    require Test::Pod;
-    Test::Pod->import();
-};
-plan(skip_all => 'Test::Pod required') if $EVAL_ERROR;
-
-all_pod_files_ok('urpm');
diff --git a/t/pod.t b/t/pod.t
new file mode 100644
index 00000000..df36c2b9
--- /dev/null
+++ b/t/pod.t
@@ -0,0 +1,5 @@
+#!perl
+use Test::More;
+eval "use Test::Pod 1.14";
+plan skip_all => "Test::Pod 1.14 required for testing POD" if $@;
+all_pod_files_ok();