13 files changed, 12 insertions, 24 deletions
diff --git a/rt/t/shredder/00load.t b/rt/t/shredder/00load.t
index 21d5ef765..a78e5e4c3 100644
--- a/rt/t/shredder/00load.t
+++ b/rt/t/shredder/00load.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 use File::Spec;
-use Test::More tests => 11;
+use Test::More tests => 11 + 1; # plus one for warnings check
 use RT::Test nodb => 1;
 
 BEGIN {
diff --git a/rt/t/shredder/00skeleton.t b/rt/t/shredder/00skeleton.t
index eab9433cd..9c6e3a1c0 100644
--- a/rt/t/shredder/00skeleton.t
+++ b/rt/t/shredder/00skeleton.t
@@ -1,11 +1,10 @@
-#!/usr/bin/perl -w
 
 use strict;
 use warnings;
 
 use Test::Deep;
 use File::Spec;
-use Test::More tests => 1;
+use Test::More tests => 1 + 1; # plus one for warnings check
 use RT::Test ();
 BEGIN {
     my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
diff --git a/rt/t/shredder/01basics.t b/rt/t/shredder/01basics.t
index 99e66c786..1fa9f75ba 100644
--- a/rt/t/shredder/01basics.t
+++ b/rt/t/shredder/01basics.t
@@ -1,11 +1,10 @@
-#!/usr/bin/perl -w
 
 use strict;
 use warnings;
 
 use Test::Deep;
 use File::Spec;
-use Test::More tests => 3;
+use Test::More tests => 3 + 1; # plus one for warnings check
 use RT::Test ();
 BEGIN {
     my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
diff --git a/rt/t/shredder/01ticket.t b/rt/t/shredder/01ticket.t
index a7abeef6e..0a9da413e 100644
--- a/rt/t/shredder/01ticket.t
+++ b/rt/t/shredder/01ticket.t
@@ -1,11 +1,10 @@
-#!/usr/bin/perl -w
 
 use strict;
 use warnings;
 
 use Test::Deep;
 use File::Spec;
-use Test::More tests => 15;
+use Test::More tests => 15 + 1; # plus one for warnings check
 use RT::Test ();
 
 
diff --git a/rt/t/shredder/02group_member.t b/rt/t/shredder/02group_member.t
index 9f8a6c6e3..9dc4f6126 100644
--- a/rt/t/shredder/02group_member.t
+++ b/rt/t/shredder/02group_member.t
@@ -1,11 +1,10 @@
-#!/usr/bin/perl -w
 
 use strict;
 use warnings;
 
 use Test::Deep;
 use File::Spec;
-use Test::More tests => 22;
+use Test::More tests => 22 + 1; # plus one for warnings check
 use RT::Test ();
 BEGIN {
     my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
diff --git a/rt/t/shredder/02queue.t b/rt/t/shredder/02queue.t
index fb5e36d6e..dd5581754 100644
--- a/rt/t/shredder/02queue.t
+++ b/rt/t/shredder/02queue.t
@@ -1,11 +1,10 @@
-#!/usr/bin/perl -w
 
 use strict;
 use warnings;
 
 use Test::Deep;
 use File::Spec;
-use Test::More tests => 16;
+use Test::More tests => 16 + 1; # plus one for warnings check
 use RT::Test ();
 BEGIN {
     my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
diff --git a/rt/t/shredder/02template.t b/rt/t/shredder/02template.t
index 16fa61588..aeb318ed6 100644
--- a/rt/t/shredder/02template.t
+++ b/rt/t/shredder/02template.t
@@ -1,11 +1,10 @@
-#!/usr/bin/perl -w
 
 use strict;
 use warnings;
 
 use Test::Deep;
 use File::Spec;
-use Test::More tests => 7;
+use Test::More tests => 7 + 1; # plus one for warnings check
 use RT::Test ();
 BEGIN {
     my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
diff --git a/rt/t/shredder/02user.t b/rt/t/shredder/02user.t
index 8c8657c7d..9f1577015 100644
--- a/rt/t/shredder/02user.t
+++ b/rt/t/shredder/02user.t
@@ -1,11 +1,10 @@
-#!/usr/bin/perl -w
 
 use strict;
 use warnings;
 
 use Test::Deep;
 use File::Spec;
-use Test::More tests => 8;
+use Test::More tests => 8 + 1; # plus one for warnings check
 use RT::Test ();
 BEGIN {
     my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
diff --git a/rt/t/shredder/03plugin.t b/rt/t/shredder/03plugin.t
index cf51e448d..15766cd2e 100644
--- a/rt/t/shredder/03plugin.t
+++ b/rt/t/shredder/03plugin.t
@@ -1,11 +1,10 @@
-#!/usr/bin/perl -w
 
 use strict;
 use warnings;
 
 use Test::Deep;
 use File::Spec;
-use Test::More tests => 28;
+use Test::More tests => 28 + 1; # plus one for warnings check
 use RT::Test ();
 BEGIN {
     my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
diff --git a/rt/t/shredder/03plugin_summary.t b/rt/t/shredder/03plugin_summary.t
index 2744531db..d450c70a2 100644
--- a/rt/t/shredder/03plugin_summary.t
+++ b/rt/t/shredder/03plugin_summary.t
@@ -1,11 +1,10 @@
-#!/usr/bin/perl -w
 
 use strict;
 use warnings;
 
 use Test::Deep;
 use File::Spec;
-use Test::More tests => 4;
+use Test::More tests => 4 + 1; # plus one for warnings check
 use RT::Test nodb => 1;
 BEGIN {
     my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
diff --git a/rt/t/shredder/03plugin_tickets.t b/rt/t/shredder/03plugin_tickets.t
index e63eef8fd..1579bc54b 100644
--- a/rt/t/shredder/03plugin_tickets.t
+++ b/rt/t/shredder/03plugin_tickets.t
@@ -1,11 +1,10 @@
-#!/usr/bin/perl -w
 
 use strict;
 use warnings;
 
 use Test::Deep;
 use File::Spec;
-use Test::More tests => 44;
+use Test::More tests => 44 + 1; # plus one for warnings check
 use RT::Test ();
 BEGIN {
     my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
diff --git a/rt/t/shredder/03plugin_users.t b/rt/t/shredder/03plugin_users.t
index 1f4cb4934..131ffa0c3 100644
--- a/rt/t/shredder/03plugin_users.t
+++ b/rt/t/shredder/03plugin_users.t
@@ -1,11 +1,10 @@
-#!/usr/bin/perl -w
 
 use strict;
 use warnings;
 
 use Test::Deep;
 use File::Spec;
-use Test::More tests => 21;
+use Test::More tests => 21 + 1; # plus one for warnings check
 use RT::Test ();
 BEGIN {
     my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
diff --git a/rt/t/shredder/utils.pl b/rt/t/shredder/utils.pl
index 9b848c662..7be951370 100644
--- a/rt/t/shredder/utils.pl
+++ b/rt/t/shredder/utils.pl
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 
 use strict;
 use warnings;