7 files changed, 13 insertions, 3 deletions
diff --git a/extensions/Review/Config.pm b/extensions/Review/Config.pm
index f7da458af..ea7e8a725 100644
--- a/extensions/Review/Config.pm
+++ b/extensions/Review/Config.pm
@@ -6,7 +6,10 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Review;
+
+use 5.10.1;
 use strict;
+use warnings;
 
 use constant NAME => 'Review';
 use constant REQUIRED_MODULES => [];
diff --git a/extensions/Review/Extension.pm b/extensions/Review/Extension.pm
index 4fd965b4c..db2b475a1 100644
--- a/extensions/Review/Extension.pm
+++ b/extensions/Review/Extension.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Review;
+
+use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Review/bin/migrate_mentor_from_whiteboard.pl b/extensions/Review/bin/migrate_mentor_from_whiteboard.pl
index 8d34963ec..ff109a5af 100755
--- a/extensions/Review/bin/migrate_mentor_from_whiteboard.pl
+++ b/extensions/Review/bin/migrate_mentor_from_whiteboard.pl
@@ -13,7 +13,7 @@ use warnings;
 $| = 1;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../../..";
+use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }
diff --git a/extensions/Review/bin/review_requests_rebuild.pl b/extensions/Review/bin/review_requests_rebuild.pl
index 04f8b1042..6574f3dbe 100755
--- a/extensions/Review/bin/review_requests_rebuild.pl
+++ b/extensions/Review/bin/review_requests_rebuild.pl
@@ -11,8 +11,8 @@ use strict;
 use warnings;
 $| = 1;
 
-use FindBin qw($Bin);
-use lib "$Bin/../../..";
+use FindBin qw($RealBin);
+use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }
diff --git a/extensions/Review/lib/FlagStateActivity.pm b/extensions/Review/lib/FlagStateActivity.pm
index 46e9300a5..35da42351 100644
--- a/extensions/Review/lib/FlagStateActivity.pm
+++ b/extensions/Review/lib/FlagStateActivity.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Review::FlagStateActivity;
+
+use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Review/lib/Util.pm b/extensions/Review/lib/Util.pm
index c00e31b6b..a8744079d 100644
--- a/extensions/Review/lib/Util.pm
+++ b/extensions/Review/lib/Util.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Review::Util;
+
+use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Review/lib/WebService.pm b/extensions/Review/lib/WebService.pm
index c4421aca1..ea8910d50 100644
--- a/extensions/Review/lib/WebService.pm
+++ b/extensions/Review/lib/WebService.pm
@@ -7,6 +7,7 @@
 
 package Bugzilla::Extension::Review::WebService;
 
+use 5.10.1;
 use strict;
 use warnings;