Bug 1321662 - Ensure that Carp and Carp::Heavy are only loaded after @INC is setup with the vendor bundles

66 files changed, 66 insertions, 72 deletions

diff --git a/qa/t/rest_bugzilla.t b/qa/t/rest_bugzilla.t
index cffab80db..01ee6af65 100644
--- a/qa/t/rest_bugzilla.t
+++ b/qa/t/rest_bugzilla.t
@@ -12,9 +12,7 @@
 use 5.10.1;
 use strict;
 use warnings;
-
-use FindBin qw($RealBin);
-use lib "$RealBin/lib", "$RealBin/../../lib", "$RealBin/../../local/lib/perl5";
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More tests => 11;
 use QA::REST;
diff --git a/qa/t/rest_classification.t b/qa/t/rest_classification.t
index d3806680a..f5485de2b 100644
--- a/qa/t/rest_classification.t
+++ b/qa/t/rest_classification.t
@@ -12,9 +12,7 @@
 use 5.10.1;
 use strict;
 use warnings;
-
-use FindBin qw($RealBin);
-use lib "$RealBin/lib", "$RealBin/../../lib", "$RealBin/../../local/lib/perl5";
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More tests => 7;
 use QA::REST;
diff --git a/qa/t/test_bmo_autolinkification.t b/qa/t/test_bmo_autolinkification.t
index 520301165..af61f09a4 100644
--- a/qa/t/test_bmo_autolinkification.t
+++ b/qa/t/test_bmo_autolinkification.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_bmo_enter_new_bug.t b/qa/t/test_bmo_enter_new_bug.t
index fde8758d0..702d067a1 100644
--- a/qa/t/test_bmo_enter_new_bug.t
+++ b/qa/t/test_bmo_enter_new_bug.t
@@ -14,7 +14,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_bmo_retire_values.t b/qa/t/test_bmo_retire_values.t
index f6086e0f9..3a74e8966 100644
--- a/qa/t/test_bmo_retire_values.t
+++ b/qa/t/test_bmo_retire_values.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_bug_edit.t b/qa/t/test_bug_edit.t
index ae72aa127..8e42a139d 100644
--- a/qa/t/test_bug_edit.t
+++ b/qa/t/test_bug_edit.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_choose_priority.t b/qa/t/test_choose_priority.t
index a35823327..95f401e66 100644
--- a/qa/t/test_choose_priority.t
+++ b/qa/t/test_choose_priority.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_classifications.t b/qa/t/test_classifications.t
index ec5597d9e..a30e72018 100644
--- a/qa/t/test_classifications.t
+++ b/qa/t/test_classifications.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_config.t b/qa/t/test_config.t
index e2f82fc21..ef1d8d898 100644
--- a/qa/t/test_config.t
+++ b/qa/t/test_config.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_create_user_accounts.t b/qa/t/test_create_user_accounts.t
index 5d6471073..050191a19 100644
--- a/qa/t/test_create_user_accounts.t
+++ b/qa/t/test_create_user_accounts.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_custom_fields.t b/qa/t/test_custom_fields.t
index 7c69e4bbf..fa669b79e 100644
--- a/qa/t/test_custom_fields.t
+++ b/qa/t/test_custom_fields.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_custom_fields_admin.t b/qa/t/test_custom_fields_admin.t
index cadb6c157..81fcfe7cb 100644
--- a/qa/t/test_custom_fields_admin.t
+++ b/qa/t/test_custom_fields_admin.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_default_groups.t b/qa/t/test_default_groups.t
index 974898dac..b163e2222 100644
--- a/qa/t/test_default_groups.t
+++ b/qa/t/test_default_groups.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_dependencies.t b/qa/t/test_dependencies.t
index f842b5fcd..c054a4d08 100644
--- a/qa/t/test_dependencies.t
+++ b/qa/t/test_dependencies.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_edit_products_properties.t b/qa/t/test_edit_products_properties.t
index 417fa4be6..b62e71061 100644
--- a/qa/t/test_edit_products_properties.t
+++ b/qa/t/test_edit_products_properties.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_enter_new_bug.t b/qa/t/test_enter_new_bug.t
index b7ac92461..ae527b32a 100644
--- a/qa/t/test_enter_new_bug.t
+++ b/qa/t/test_enter_new_bug.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_flags.t b/qa/t/test_flags.t
index 0f7c950f7..8b7883bb5 100644
--- a/qa/t/test_flags.t
+++ b/qa/t/test_flags.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_flags2.t b/qa/t/test_flags2.t
index 9706af639..cec9ee6ef 100644
--- a/qa/t/test_flags2.t
+++ b/qa/t/test_flags2.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_groups.t b/qa/t/test_groups.t
index caf30fbac..eab30125f 100644
--- a/qa/t/test_groups.t
+++ b/qa/t/test_groups.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_keywords.t b/qa/t/test_keywords.t
index 5789676b4..72a4f6049 100644
--- a/qa/t/test_keywords.t
+++ b/qa/t/test_keywords.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_login.t b/qa/t/test_login.t
index 2b66d6e3c..45bf1408f 100644
--- a/qa/t/test_login.t
+++ b/qa/t/test_login.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_long_list_redirection.t b/qa/t/test_long_list_redirection.t
index 4e3a8ba97..2ee23f9a2 100644
--- a/qa/t/test_long_list_redirection.t
+++ b/qa/t/test_long_list_redirection.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More "no_plan";
 use QA::Util;
 
diff --git a/qa/t/test_milestones.t b/qa/t/test_milestones.t
index baf04d402..e55bd5ca4 100644
--- a/qa/t/test_milestones.t
+++ b/qa/t/test_milestones.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_password_complexity.t b/qa/t/test_password_complexity.t
index 5d358864b..97b440ddd 100644
--- a/qa/t/test_password_complexity.t
+++ b/qa/t/test_password_complexity.t
@@ -8,9 +8,7 @@
 use 5.10.1;
 use strict;
 use warnings;
-
-use FindBin qw($RealBin);
-use lib "$RealBin/lib", "$RealBin/../../lib", "$RealBin/../../local/lib/perl5";
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 use QA::Util;
diff --git a/qa/t/test_private_attachments.t b/qa/t/test_private_attachments.t
index 74b5adac9..6126974d7 100644
--- a/qa/t/test_private_attachments.t
+++ b/qa/t/test_private_attachments.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_qa_contact.t b/qa/t/test_qa_contact.t
index 66bcb74ab..b75044806 100644
--- a/qa/t/test_qa_contact.t
+++ b/qa/t/test_qa_contact.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_require_login.t b/qa/t/test_require_login.t
index e4fd81891..7b39e7329 100644
--- a/qa/t/test_require_login.t
+++ b/qa/t/test_require_login.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_sanity_check.t b/qa/t/test_sanity_check.t
index 84fc4d8c4..06ab57355 100644
--- a/qa/t/test_sanity_check.t
+++ b/qa/t/test_sanity_check.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_saved_searches.t b/qa/t/test_saved_searches.t
index b92307e60..b5f47ff4a 100644
--- a/qa/t/test_saved_searches.t
+++ b/qa/t/test_saved_searches.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_search.t b/qa/t/test_search.t
index b1f77aebf..780708a84 100644
--- a/qa/t/test_search.t
+++ b/qa/t/test_search.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use Test::More "no_plan";
 
diff --git a/qa/t/test_security.t b/qa/t/test_security.t
index 7ff0152be..6d545ffd5 100644
--- a/qa/t/test_security.t
+++ b/qa/t/test_security.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_shared_searches.t b/qa/t/test_shared_searches.t
index 6b38a271b..edae86dec 100644
--- a/qa/t/test_shared_searches.t
+++ b/qa/t/test_shared_searches.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_show_all_products.t b/qa/t/test_show_all_products.t
index 97d915174..36f61e42c 100644
--- a/qa/t/test_show_all_products.t
+++ b/qa/t/test_show_all_products.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_shutdown.t b/qa/t/test_shutdown.t
index be562ad24..33b9b426b 100644
--- a/qa/t/test_shutdown.t
+++ b/qa/t/test_shutdown.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_status_whiteboard.t b/qa/t/test_status_whiteboard.t
index 6c7f7b085..94582dd54 100644
--- a/qa/t/test_status_whiteboard.t
+++ b/qa/t/test_status_whiteboard.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_sudo_sessions.t b/qa/t/test_sudo_sessions.t
index fb2b52a40..9ef93c32d 100644
--- a/qa/t/test_sudo_sessions.t
+++ b/qa/t/test_sudo_sessions.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_target_milestones.t b/qa/t/test_target_milestones.t
index f02eb42d7..6aa211428 100644
--- a/qa/t/test_target_milestones.t
+++ b/qa/t/test_target_milestones.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_time_summary.t b/qa/t/test_time_summary.t
index 0ae2ea5da..504c864f2 100644
--- a/qa/t/test_time_summary.t
+++ b/qa/t/test_time_summary.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_user_groups.t b/qa/t/test_user_groups.t
index 654f8dad6..89fc2fd6d 100644
--- a/qa/t/test_user_groups.t
+++ b/qa/t/test_user_groups.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_user_matching.t b/qa/t/test_user_matching.t
index 0326b8770..3b7b71ed5 100644
--- a/qa/t/test_user_matching.t
+++ b/qa/t/test_user_matching.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_user_preferences.t b/qa/t/test_user_preferences.t
index ec5fa8187..d9e0562c1 100644
--- a/qa/t/test_user_preferences.t
+++ b/qa/t/test_user_preferences.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_user_privs.t b/qa/t/test_user_privs.t
index 367049bc7..72b205b25 100644
--- a/qa/t/test_user_privs.t
+++ b/qa/t/test_user_privs.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/test_votes.t b/qa/t/test_votes.t
index b36491b60..ee257e85c 100644
--- a/qa/t/test_votes.t
+++ b/qa/t/test_votes.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 
 use Test::More "no_plan";
 
diff --git a/qa/t/webservice_bug_add_attachment.t b/qa/t/webservice_bug_add_attachment.t
index 1ea0ca76a..e2dad94c3 100644
--- a/qa/t/webservice_bug_add_attachment.t
+++ b/qa/t/webservice_bug_add_attachment.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use MIME::Base64 qw(encode_base64 decode_base64);
 use Test::More tests => 187;
diff --git a/qa/t/webservice_bug_add_comment.t b/qa/t/webservice_bug_add_comment.t
index 64c410f3f..cf0310602 100644
--- a/qa/t/webservice_bug_add_comment.t
+++ b/qa/t/webservice_bug_add_comment.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use Test::More tests => 141;
 my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();
diff --git a/qa/t/webservice_bug_attachments.t b/qa/t/webservice_bug_attachments.t
index da63ddd27..daa5032a3 100644
--- a/qa/t/webservice_bug_attachments.t
+++ b/qa/t/webservice_bug_attachments.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use QA::Tests qw(STANDARD_BUG_TESTS PRIVATE_BUG_USER);
 use Data::Dumper;
diff --git a/qa/t/webservice_bug_comments.t b/qa/t/webservice_bug_comments.t
index df583c8ce..ccc0c6d34 100644
--- a/qa/t/webservice_bug_comments.t
+++ b/qa/t/webservice_bug_comments.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use DateTime;
 use QA::Util;
 use QA::Tests qw(STANDARD_BUG_TESTS PRIVATE_BUG_USER);
diff --git a/qa/t/webservice_bug_create.t b/qa/t/webservice_bug_create.t
index 640a714be..8bab088af 100644
--- a/qa/t/webservice_bug_create.t
+++ b/qa/t/webservice_bug_create.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Storable qw(dclone);
 use Test::More tests => 293;
 use QA::Util;
diff --git a/qa/t/webservice_bug_fields.t b/qa/t/webservice_bug_fields.t
index d72b25170..be565521f 100644
--- a/qa/t/webservice_bug_fields.t
+++ b/qa/t/webservice_bug_fields.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Data::Dumper;
 use Test::More;
 use List::Util qw(first);
diff --git a/qa/t/webservice_bug_get.t b/qa/t/webservice_bug_get.t
index a68f92899..88cc42989 100644
--- a/qa/t/webservice_bug_get.t
+++ b/qa/t/webservice_bug_get.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Data::Dumper;
 use DateTime;
 use QA::Util;
diff --git a/qa/t/webservice_bug_get_bugs.t b/qa/t/webservice_bug_get_bugs.t
index d83861350..d66249b2c 100644
--- a/qa/t/webservice_bug_get_bugs.t
+++ b/qa/t/webservice_bug_get_bugs.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Data::Dumper;
 use DateTime;
 use QA::Util;
diff --git a/qa/t/webservice_bug_history.t b/qa/t/webservice_bug_history.t
index 3153834fa..7451fe450 100644
--- a/qa/t/webservice_bug_history.t
+++ b/qa/t/webservice_bug_history.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use QA::Tests qw(STANDARD_BUG_TESTS);
 use Test::More tests => 114;
diff --git a/qa/t/webservice_bug_legal_values.t b/qa/t/webservice_bug_legal_values.t
index 8e1b039a3..29f444708 100644
--- a/qa/t/webservice_bug_legal_values.t
+++ b/qa/t/webservice_bug_legal_values.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More tests => 269;
 use QA::Util;
 my ($config, @clients) = get_rpc_clients();
diff --git a/qa/t/webservice_bug_search.t b/qa/t/webservice_bug_search.t
index 0a4dcd666..6a4933c5a 100644
--- a/qa/t/webservice_bug_search.t
+++ b/qa/t/webservice_bug_search.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use QA::Tests qw(PRIVATE_BUG_USER);
 use DateTime;
diff --git a/qa/t/webservice_bug_update.t b/qa/t/webservice_bug_update.t
index 8ca59cfa7..097c506b6 100644
--- a/qa/t/webservice_bug_update.t
+++ b/qa/t/webservice_bug_update.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Data::Dumper;
 use QA::Util;
 use QA::Tests qw(PRIVATE_BUG_USER STANDARD_BUG_TESTS);
diff --git a/qa/t/webservice_bug_update_see_also.t b/qa/t/webservice_bug_update_see_also.t
index 3bdc3dc25..fc6c9bc9e 100644
--- a/qa/t/webservice_bug_update_see_also.t
+++ b/qa/t/webservice_bug_update_see_also.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use QA::Tests qw(PRIVATE_BUG_USER STANDARD_BUG_TESTS);
 use Test::More tests => 117;
diff --git a/qa/t/webservice_bugzilla.t b/qa/t/webservice_bugzilla.t
index fef57cca1..6d40e3088 100644
--- a/qa/t/webservice_bugzilla.t
+++ b/qa/t/webservice_bugzilla.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More tests => 11 * 3;
 use QA::Util;
 my ($config, @clients) = get_rpc_clients();
diff --git a/qa/t/webservice_group_create.t b/qa/t/webservice_group_create.t
index 346800b0e..9ddf43d86 100644
--- a/qa/t/webservice_group_create.t
+++ b/qa/t/webservice_group_create.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More tests => 77;
 use QA::Util;
 
diff --git a/qa/t/webservice_jsonp.t b/qa/t/webservice_jsonp.t
index dd62b6392..53b23aaf2 100644
--- a/qa/t/webservice_jsonp.t
+++ b/qa/t/webservice_jsonp.t
@@ -7,7 +7,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More tests => 85;
 use QA::Util;
 my $jsonrpc_get = QA::Util::get_jsonrpc_client('GET');
diff --git a/qa/t/webservice_product.t b/qa/t/webservice_product.t
index 7f993899f..1ced65276 100644
--- a/qa/t/webservice_product.t
+++ b/qa/t/webservice_product.t
@@ -15,7 +15,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More tests => 134;
 use QA::Util;
 my ($config, @clients) = get_rpc_clients();
diff --git a/qa/t/webservice_product_create.t b/qa/t/webservice_product_create.t
index 05b82d60c..3b8fe78b1 100644
--- a/qa/t/webservice_product_create.t
+++ b/qa/t/webservice_product_create.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More tests => 121;
 use QA::Util;
 
diff --git a/qa/t/webservice_product_get.t b/qa/t/webservice_product_get.t
index 0128f3348..7f445ced7 100644
--- a/qa/t/webservice_product_get.t
+++ b/qa/t/webservice_product_get.t
@@ -15,7 +15,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Test::More tests => 134;
 use QA::Util;
 my ($config, @clients) = get_rpc_clients();
diff --git a/qa/t/webservice_user_create.t b/qa/t/webservice_user_create.t
index 551de9977..f82e71ae4 100644
--- a/qa/t/webservice_user_create.t
+++ b/qa/t/webservice_user_create.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use Test::More tests => 75;
 my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();
diff --git a/qa/t/webservice_user_get.t b/qa/t/webservice_user_get.t
index 7d50bf22e..4a7f74f78 100644
--- a/qa/t/webservice_user_get.t
+++ b/qa/t/webservice_user_get.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use QA::Tests qw(PRIVATE_BUG_USER);
 use Test::More tests => 330;
diff --git a/qa/t/webservice_user_login_logout.t b/qa/t/webservice_user_login_logout.t
index 2affb961c..a6abec88e 100644
--- a/qa/t/webservice_user_login_logout.t
+++ b/qa/t/webservice_user_login_logout.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use Data::Dumper;
 use QA::Util;
 use Test::More tests => 119;
diff --git a/qa/t/webservice_user_offer_account_by_email.t b/qa/t/webservice_user_offer_account_by_email.t
index ae311afb8..e9392bab5 100644
--- a/qa/t/webservice_user_offer_account_by_email.t
+++ b/qa/t/webservice_user_offer_account_by_email.t
@@ -11,7 +11,7 @@
 
 use strict;
 use warnings;
-use lib qw(lib);
+use lib qw(lib ../../lib ../../local/lib/perl5);
 use QA::Util;
 use Test::More tests => 29;
 my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();