diff --git a/t/Installer_PerlModules.t b/t/Installer_PerlModules.t
index 61d9bc22f5..0a81da024d 100755
--- a/t/Installer_PerlModules.t
+++ b/t/Installer_PerlModules.t
@@ -5,23 +5,26 @@
 
 use Modern::Perl;
 
-use Test::More tests => 6;
+use Test::More tests => 3;
+use Test::Warn;
 
 BEGIN {
         use_ok('C4::Installer::PerlModules');
 }
 
-my $modules;
-ok ($modules = C4::Installer::PerlModules->new(), 'Tests modules object');
-my $prereq_pm = $modules->prereq_pm();
-ok (exists($prereq_pm->{"DBI"}), 'DBI required for installer to run');
-ok (exists($prereq_pm->{"CGI"}), 'CGI required for installer to run' );
-ok (exists($prereq_pm->{"YAML::XS"}), 'YAML::XS required for installer to run');
+subtest 'prereq_pm' => sub {
+    my $modules;
+    ok ($modules = C4::Installer::PerlModules->new(), 'Tests modules object');
+    my $prereq_pm = $modules->prereq_pm();
+    ok (exists($prereq_pm->{"DBI"}), 'DBI required for installer to run');
+    ok (exists($prereq_pm->{"CGI"}), 'CGI required for installer to run' );
+    ok (exists($prereq_pm->{"YAML::XS"}), 'YAML::XS required for installer to run');
+};
 
 subtest 'versions_info' => sub {
-    plan tests => 4;
+    plan tests => 5;
     my $modules = C4::Installer::PerlModules->new;
-    $modules->versions_info;
+    warning_is { $modules->versions_info } undef, 'No warnings from versions_info';
     ok( exists $modules->{missing_pm}, 'versions_info fills the missing_pm key' );
     ok( exists $modules->{upgrade_pm}, 'versions_info fills the upgrade_pm key' );
     ok( exists $modules->{current_pm}, 'versions_info fills the current_pm key' );
diff --git a/t/Installer_pm.t b/t/Installer_pm.t
deleted file mode 100755
index 0ed28ee0e5..0000000000
--- a/t/Installer_pm.t
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/perl
-#
-use strict;
-use warnings;
-
-use Test::More tests => 2;
-use Data::Dumper;
-
-BEGIN {
-    use_ok('C4::Installer::PerlModules');
-}
-
-my $obj = C4::Installer::PerlModules->new;
-
-isa_ok($obj,'C4::Installer::PerlModules');