diff --git a/Cassandane/Cassini.pm b/Cassandane/Cassini.pm
index 8614deaa3..6230819d5 100644
--- a/Cassandane/Cassini.pm
+++ b/Cassandane/Cassini.pm
@@ -46,6 +46,8 @@ use strict;
 use warnings;
 use Cwd qw(abs_path);
 use Config::IniFiles;
+
+use lib '.';
 use Cassandane::Util::Log;
 
 my $instance;
diff --git a/Cassandane/Config.pm b/Cassandane/Config.pm
index d4374b0cb..a52334f65 100644
--- a/Cassandane/Config.pm
+++ b/Cassandane/Config.pm
@@ -41,6 +41,8 @@
 package Cassandane::Config;
 use strict;
 use warnings;
+
+use lib '.';
 use Cassandane::Cassini;
 use Cassandane::Util::Log;
 
diff --git a/Cassandane/Cyrus/ACL.pm b/Cassandane/Cyrus/ACL.pm
index f48e97be7..0bba03fad 100644
--- a/Cassandane/Cyrus/ACL.pm
+++ b/Cassandane/Cyrus/ACL.pm
@@ -39,16 +39,18 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::ACL;
 use strict;
 use warnings;
-package Cassandane::Cyrus::ACL;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
+use Data::Dumper;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Generator;
 use Cassandane::MessageStoreFactory;
 use Cassandane::Instance;
-use Data::Dumper;
 
 sub new
 {
diff --git a/Cassandane/Cyrus/Admin.pm b/Cassandane/Cyrus/Admin.pm
index 52149e1da..ca978f61b 100644
--- a/Cassandane/Cyrus/Admin.pm
+++ b/Cassandane/Cyrus/Admin.pm
@@ -37,15 +37,16 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Admin;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Admin;
+use Data::Dumper;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Instance;
 
-use Data::Dumper;
-
 sub new
 {
     my $class = shift;
diff --git a/Cassandane/Cyrus/Annotator.pm b/Cassandane/Cyrus/Annotator.pm
index 6767c4b7a..ee400aec8 100644
--- a/Cassandane/Cyrus/Annotator.pm
+++ b/Cassandane/Cyrus/Annotator.pm
@@ -39,11 +39,13 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Annotator;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Annotator;
-use base qw(Cassandane::Cyrus::TestCase);
 use Cwd qw(abs_path);
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Util::Wait;
 
diff --git a/Cassandane/Cyrus/Archive.pm b/Cassandane/Cyrus/Archive.pm
index 04f3c2074..fffae7442 100644
--- a/Cassandane/Cyrus/Archive.pm
+++ b/Cassandane/Cyrus/Archive.pm
@@ -39,14 +39,16 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Archive;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Archive;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
+use Data::Dumper;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Util::Words;
-use Data::Dumper;
 
 sub new
 {
diff --git a/Cassandane/Cyrus/Bug3072.pm b/Cassandane/Cyrus/Bug3072.pm
index a2f57c850..63f685247 100644
--- a/Cassandane/Cyrus/Bug3072.pm
+++ b/Cassandane/Cyrus/Bug3072.pm
@@ -39,11 +39,13 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Bug3072;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Bug3072;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
 sub new
diff --git a/Cassandane/Cyrus/Bug3463.pm b/Cassandane/Cyrus/Bug3463.pm
index d5acf56f5..4b7329967 100644
--- a/Cassandane/Cyrus/Bug3463.pm
+++ b/Cassandane/Cyrus/Bug3463.pm
@@ -39,16 +39,18 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Bug3463;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Bug3463;
-use base qw(Cassandane::Unit::TestCase);
 use DateTime;
+use Data::Dumper;
+
+use lib '.';
+use base qw(Cassandane::Unit::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Generator;
 use Cassandane::MessageStoreFactory;
 use Cassandane::Instance;
-use Data::Dumper;
 
 sub new
 {
diff --git a/Cassandane/Cyrus/Bug3470.pm b/Cassandane/Cyrus/Bug3470.pm
index 445d0d046..c66a1a3d9 100644
--- a/Cassandane/Cyrus/Bug3470.pm
+++ b/Cassandane/Cyrus/Bug3470.pm
@@ -39,16 +39,18 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Bug3470;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Bug3470;
-use base qw(Cassandane::Unit::TestCase);
 use DateTime;
+use Data::Dumper;
+
+use lib '.';
+use base qw(Cassandane::Unit::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Generator;
 use Cassandane::MessageStoreFactory;
 use Cassandane::Instance;
-use Data::Dumper;
 
 sub new
 {
diff --git a/Cassandane/Cyrus/Bug3649.pm b/Cassandane/Cyrus/Bug3649.pm
index b612d361a..71f5c95a0 100644
--- a/Cassandane/Cyrus/Bug3649.pm
+++ b/Cassandane/Cyrus/Bug3649.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Bug3649;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Bug3649;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Instance;
diff --git a/Cassandane/Cyrus/Bug3903.pm b/Cassandane/Cyrus/Bug3903.pm
index 7815bccd5..b48ae4a8b 100644
--- a/Cassandane/Cyrus/Bug3903.pm
+++ b/Cassandane/Cyrus/Bug3903.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Bug3903;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Bug3903;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
diff --git a/Cassandane/Cyrus/Caldav.pm b/Cassandane/Cyrus/Caldav.pm
index 06645399d..91856f423 100644
--- a/Cassandane/Cyrus/Caldav.pm
+++ b/Cassandane/Cyrus/Caldav.pm
@@ -39,17 +39,18 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Caldav;
 use strict;
 use warnings;
-
-package Cassandane::Cyrus::Caldav;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
-use Cassandane::Util::Log;
 use JSON::XS;
 use Net::CalDAVTalk;
 use Data::Dumper;
 
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
+use Cassandane::Util::Log;
+
 sub new
 {
     my $class = shift;
diff --git a/Cassandane/Cyrus/CaldavAlarm.pm b/Cassandane/Cyrus/CaldavAlarm.pm
index b165577fe..be1ade0c7 100644
--- a/Cassandane/Cyrus/CaldavAlarm.pm
+++ b/Cassandane/Cyrus/CaldavAlarm.pm
@@ -39,20 +39,21 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::CaldavAlarm;
 use strict;
 use warnings;
-
-package Cassandane::Cyrus::CaldavAlarm;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
 use DateTime::Format::ISO8601;
-use Cassandane::Util::Log;
 use JSON::XS;
 use Net::CalDAVTalk;
 use Data::Dumper;
 use POSIX;
 use Carp;
 
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
+use Cassandane::Util::Log;
+
 sub new
 {
     my $class = shift;
diff --git a/Cassandane/Cyrus/Carddav.pm b/Cassandane/Cyrus/Carddav.pm
index 0752dac8c..22807de84 100644
--- a/Cassandane/Cyrus/Carddav.pm
+++ b/Cassandane/Cyrus/Carddav.pm
@@ -39,19 +39,20 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Carddav;
 use strict;
 use warnings;
-
-package Cassandane::Cyrus::Carddav;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
-use Cassandane::Util::Log;
 use JSON::XS;
 use Net::CardDAVTalk;
 use Net::CardDAVTalk::VCard;
 use Data::Dumper;
 use XML::Spice;
 
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
+use Cassandane::Util::Log;
+
 sub new
 {
     my $class = shift;
diff --git a/Cassandane/Cyrus/Conversations.pm b/Cassandane/Cyrus/Conversations.pm
index 8cf3c5f84..7333cdf42 100755
--- a/Cassandane/Cyrus/Conversations.pm
+++ b/Cassandane/Cyrus/Conversations.pm
@@ -39,12 +39,14 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Conversations;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Conversations;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
 use URI::Escape;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::ThreadedGenerator;
 use Cassandane::Util::Log;
 use Cassandane::Util::DateTime qw(to_iso8601 from_iso8601
diff --git a/Cassandane/Cyrus/CyrusDB.pm b/Cassandane/Cyrus/CyrusDB.pm
index dad03463a..7b3352347 100644
--- a/Cassandane/Cyrus/CyrusDB.pm
+++ b/Cassandane/Cyrus/CyrusDB.pm
@@ -37,9 +37,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::CyrusDB;
 use strict;
 use warnings;
-package Cassandane::Cyrus::CyrusDB;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Instance;
diff --git a/Cassandane/Cyrus/Delete.pm b/Cassandane/Cyrus/Delete.pm
index 33819d08a..35c6e8bec 100644
--- a/Cassandane/Cyrus/Delete.pm
+++ b/Cassandane/Cyrus/Delete.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Delete;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Delete;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
diff --git a/Cassandane/Cyrus/Delivery.pm b/Cassandane/Cyrus/Delivery.pm
index f06ac99e6..7a61a3443 100644
--- a/Cassandane/Cyrus/Delivery.pm
+++ b/Cassandane/Cyrus/Delivery.pm
@@ -39,11 +39,13 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Delivery;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Delivery;
-use base qw(Cassandane::Cyrus::TestCase);
 use IO::File;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
 Cassandane::Cyrus::TestCase::magic(DuplicateSuppressionOff => sub {
diff --git a/Cassandane/Cyrus/Deny.pm b/Cassandane/Cyrus/Deny.pm
index e3b9e89c5..de4acaca2 100644
--- a/Cassandane/Cyrus/Deny.pm
+++ b/Cassandane/Cyrus/Deny.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Deny;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Deny;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
diff --git a/Cassandane/Cyrus/Expunge.pm b/Cassandane/Cyrus/Expunge.pm
index 7c3c350c2..d1d70eba2 100644
--- a/Cassandane/Cyrus/Expunge.pm
+++ b/Cassandane/Cyrus/Expunge.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Expunge;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Expunge;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
diff --git a/Cassandane/Cyrus/Fetch.pm b/Cassandane/Cyrus/Fetch.pm
index ed86a0cf4..0e0f93831 100644
--- a/Cassandane/Cyrus/Fetch.pm
+++ b/Cassandane/Cyrus/Fetch.pm
@@ -39,14 +39,16 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Fetch;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Fetch;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
-use Cassandane::Util::Log;
 use IO::Scalar;
 
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
+use Cassandane::Util::Log;
+
 sub new
 {
     my $class = shift;
diff --git a/Cassandane/Cyrus/Flags.pm b/Cassandane/Cyrus/Flags.pm
index b310e7fc1..2cd4542f1 100644
--- a/Cassandane/Cyrus/Flags.pm
+++ b/Cassandane/Cyrus/Flags.pm
@@ -39,14 +39,16 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Flags;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Flags;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
+use Data::Dumper;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Util::Words;
-use Data::Dumper;
 
 sub new
 {
diff --git a/Cassandane/Cyrus/Idle.pm b/Cassandane/Cyrus/Idle.pm
index 27dd5082b..1a8ad2fc4 100644
--- a/Cassandane/Cyrus/Idle.pm
+++ b/Cassandane/Cyrus/Idle.pm
@@ -39,11 +39,13 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Idle;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Idle;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
 sub new
diff --git a/Cassandane/Cyrus/ImapTest.pm b/Cassandane/Cyrus/ImapTest.pm
index f43d19685..9a7c9685d 100644
--- a/Cassandane/Cyrus/ImapTest.pm
+++ b/Cassandane/Cyrus/ImapTest.pm
@@ -39,13 +39,15 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::ImapTest;
 use strict;
 use warnings;
-package Cassandane::Cyrus::ImapTest;
-use base qw(Cassandane::Cyrus::TestCase);
 use Cwd qw(abs_path);
 use File::Path qw(mkpath);
 use DateTime;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Cassini;
 
diff --git a/Cassandane/Cyrus/Info.pm b/Cassandane/Cyrus/Info.pm
index 153fba39e..5abb8a7b2 100644
--- a/Cassandane/Cyrus/Info.pm
+++ b/Cassandane/Cyrus/Info.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Info;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Info;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Instance;
diff --git a/Cassandane/Cyrus/JMAP.pm b/Cassandane/Cyrus/JMAP.pm
index fa01dc0dc..bdc6c6fb4 100644
--- a/Cassandane/Cyrus/JMAP.pm
+++ b/Cassandane/Cyrus/JMAP.pm
@@ -39,18 +39,20 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::JMAP;
 use strict;
 use warnings;
-
-package Cassandane::Cyrus::JMAP;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
-use Cassandane::Util::Log;
 use JSON::XS;
 use Net::CalDAVTalk;
 use Net::CardDAVTalk;
 use Mail::JMAPTalk;
 use Data::Dumper;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
+use Cassandane::Util::Log;
+
 use charnames ':full';
 
 sub new
diff --git a/Cassandane/Cyrus/List.pm b/Cassandane/Cyrus/List.pm
index 17fc01a63..573e4d7b3 100644
--- a/Cassandane/Cyrus/List.pm
+++ b/Cassandane/Cyrus/List.pm
@@ -39,16 +39,18 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::List;
 use strict;
 use warnings;
-package Cassandane::Cyrus::List;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
+use Data::Dumper;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Generator;
 use Cassandane::MessageStoreFactory;
 use Cassandane::Instance;
-use Data::Dumper;
 
 sub new
 {
diff --git a/Cassandane/Cyrus/Lsub.pm b/Cassandane/Cyrus/Lsub.pm
index f0f148090..a2d29b338 100644
--- a/Cassandane/Cyrus/Lsub.pm
+++ b/Cassandane/Cyrus/Lsub.pm
@@ -39,16 +39,18 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Lsub;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Lsub;
-use base qw(Cassandane::Unit::TestCase);
 use DateTime;
+use Data::Dumper;
+
+use lib '.';
+use base qw(Cassandane::Unit::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Generator;
 use Cassandane::MessageStoreFactory;
 use Cassandane::Instance;
-use Data::Dumper;
 
 sub new
 {
diff --git a/Cassandane/Cyrus/Master.pm b/Cassandane/Cyrus/Master.pm
index 715fa417c..472f695d5 100644
--- a/Cassandane/Cyrus/Master.pm
+++ b/Cassandane/Cyrus/Master.pm
@@ -39,12 +39,14 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Master;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Master;
-use base qw(Cassandane::Cyrus::TestCase);
 use POSIX qw(getcwd);
 use DateTime;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Util::Wait;
 use Cassandane::Util::Socket;
diff --git a/Cassandane/Cyrus/Metadata.pm b/Cassandane/Cyrus/Metadata.pm
index 67c6e9f76..4cbb3ef85 100644
--- a/Cassandane/Cyrus/Metadata.pm
+++ b/Cassandane/Cyrus/Metadata.pm
@@ -39,13 +39,15 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Metadata;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Metadata;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
 use File::Temp qw(:POSIX);
 use Config;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
 sub new
diff --git a/Cassandane/Cyrus/Murder.pm b/Cassandane/Cyrus/Murder.pm
index e97f2ffd6..c0374afdb 100644
--- a/Cassandane/Cyrus/Murder.pm
+++ b/Cassandane/Cyrus/Murder.pm
@@ -37,9 +37,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Murder;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Murder;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Instance;
diff --git a/Cassandane/Cyrus/Nntp.pm b/Cassandane/Cyrus/Nntp.pm
index a4e24a6d2..43b3f28ae 100644
--- a/Cassandane/Cyrus/Nntp.pm
+++ b/Cassandane/Cyrus/Nntp.pm
@@ -39,12 +39,14 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Nntp;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Nntp;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
 use News::NNTPClient;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Util::Words;
 
diff --git a/Cassandane/Cyrus/Pop3.pm b/Cassandane/Cyrus/Pop3.pm
index bbd666dcf..9d74726ff 100644
--- a/Cassandane/Cyrus/Pop3.pm
+++ b/Cassandane/Cyrus/Pop3.pm
@@ -39,12 +39,14 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Pop3;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Pop3;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
 use Net::POP3;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
 Cassandane::Cyrus::TestCase::magic(PopSubFolders => sub {
diff --git a/Cassandane/Cyrus/Quota.pm b/Cassandane/Cyrus/Quota.pm
index 2d5b6597e..58f9d10a2 100644
--- a/Cassandane/Cyrus/Quota.pm
+++ b/Cassandane/Cyrus/Quota.pm
@@ -39,16 +39,18 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Quota;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Quota;
-use base qw(Cassandane::Cyrus::TestCase);
 use Cwd qw(abs_path);
 use File::Path qw(mkpath);
 use DateTime;
+use Data::Dumper;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Util::NetString;
-use Data::Dumper;
 
 
 sub new
diff --git a/Cassandane/Cyrus/Rename.pm b/Cassandane/Cyrus/Rename.pm
index b05c24ba4..332e2b2e4 100644
--- a/Cassandane/Cyrus/Rename.pm
+++ b/Cassandane/Cyrus/Rename.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Rename;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Rename;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Instance;
diff --git a/Cassandane/Cyrus/Replication.pm b/Cassandane/Cyrus/Replication.pm
index 3480c9db9..7323bad43 100644
--- a/Cassandane/Cyrus/Replication.pm
+++ b/Cassandane/Cyrus/Replication.pm
@@ -39,11 +39,13 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Replication;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Replication;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Service;
 use Cassandane::Config;
diff --git a/Cassandane/Cyrus/Search.pm b/Cassandane/Cyrus/Search.pm
index 10165f4dd..0656b7779 100644
--- a/Cassandane/Cyrus/Search.pm
+++ b/Cassandane/Cyrus/Search.pm
@@ -39,15 +39,17 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Search;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Search;
-use base qw(Cassandane::Cyrus::TestCase);
 use Cwd qw(abs_path);
 use DateTime;
-use Cassandane::Util::Log;
 use Data::Dumper;
 
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
+use Cassandane::Util::Log;
+
 sub new
 {
     my $class = shift;
diff --git a/Cassandane/Cyrus/SearchFuzzy.pm b/Cassandane/Cyrus/SearchFuzzy.pm
index 42704a936..4d60deb2a 100644
--- a/Cassandane/Cyrus/SearchFuzzy.pm
+++ b/Cassandane/Cyrus/SearchFuzzy.pm
@@ -39,15 +39,17 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::SearchFuzzy;
 use strict;
 use warnings;
-package Cassandane::Cyrus::SearchFuzzy;
-use base qw(Cassandane::Cyrus::TestCase);
 use Cwd qw(abs_path);
 use DateTime;
-use Cassandane::Util::Log;
 use Data::Dumper;
 
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
+use Cassandane::Util::Log;
+
 sub new
 {
     my $class = shift;
diff --git a/Cassandane/Cyrus/Sieve.pm b/Cassandane/Cyrus/Sieve.pm
index 5c8e07a1c..180e51061 100644
--- a/Cassandane/Cyrus/Sieve.pm
+++ b/Cassandane/Cyrus/Sieve.pm
@@ -39,11 +39,13 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Sieve;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Sieve;
-use base qw(Cassandane::Cyrus::TestCase);
 use IO::File;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
 sub new
diff --git a/Cassandane/Cyrus/Simple.pm b/Cassandane/Cyrus/Simple.pm
index d7d3d4e04..cb46b2c8b 100644
--- a/Cassandane/Cyrus/Simple.pm
+++ b/Cassandane/Cyrus/Simple.pm
@@ -39,11 +39,13 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Simple;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Simple;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
 sub new
diff --git a/Cassandane/Cyrus/Specialuse.pm b/Cassandane/Cyrus/Specialuse.pm
index 892983714..61693da9a 100644
--- a/Cassandane/Cyrus/Specialuse.pm
+++ b/Cassandane/Cyrus/Specialuse.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Specialuse;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Specialuse;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Instance;
diff --git a/Cassandane/Cyrus/T116.pm b/Cassandane/Cyrus/T116.pm
index 32586afad..d65e159eb 100644
--- a/Cassandane/Cyrus/T116.pm
+++ b/Cassandane/Cyrus/T116.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::T116;
 use strict;
 use warnings;
-package Cassandane::Cyrus::T116;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Instance;
diff --git a/Cassandane/Cyrus/TestCase.pm b/Cassandane/Cyrus/TestCase.pm
index a41d844e4..9462e4a3b 100644
--- a/Cassandane/Cyrus/TestCase.pm
+++ b/Cassandane/Cyrus/TestCase.pm
@@ -39,12 +39,14 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::TestCase;
 use strict;
 use warnings;
-package Cassandane::Cyrus::TestCase;
-use base qw(Cassandane::Unit::TestCase);
-use Scalar::Util qw(refaddr);
 use attributes;
+use Scalar::Util qw(refaddr);
+
+use lib '.';
+use base qw(Cassandane::Unit::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Util::Words;
 use Cassandane::Generator;
diff --git a/Cassandane/Cyrus/TesterCalDAV.pm b/Cassandane/Cyrus/TesterCalDAV.pm
index 1c3d0d501..5e4127766 100644
--- a/Cassandane/Cyrus/TesterCalDAV.pm
+++ b/Cassandane/Cyrus/TesterCalDAV.pm
@@ -37,16 +37,18 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::TesterCalDAV;
 use strict;
 use warnings;
-package Cassandane::Cyrus::TesterCalDAV;
-use base qw(Cassandane::Cyrus::TestCase);
 use Cwd qw(abs_path);
 use File::Path qw(mkpath);
 use DateTime;
+use JSON::XS;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Cassini;
-use JSON::XS;
 
 my $basedir;
 my $binary;
diff --git a/Cassandane/Cyrus/TesterCardDAV.pm b/Cassandane/Cyrus/TesterCardDAV.pm
index d9f2531c7..66d9d1d7a 100644
--- a/Cassandane/Cyrus/TesterCardDAV.pm
+++ b/Cassandane/Cyrus/TesterCardDAV.pm
@@ -37,16 +37,18 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::TesterCardDAV;
 use strict;
 use warnings;
-package Cassandane::Cyrus::TesterCardDAV;
-use base qw(Cassandane::Cyrus::TestCase);
 use Cwd qw(abs_path);
 use File::Path qw(mkpath);
 use DateTime;
+use JSON::XS;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Cassini;
-use JSON::XS;
 
 my $basedir;
 my $binary;
diff --git a/Cassandane/Cyrus/Thread.pm b/Cassandane/Cyrus/Thread.pm
index f16918d95..fef67df8f 100644
--- a/Cassandane/Cyrus/Thread.pm
+++ b/Cassandane/Cyrus/Thread.pm
@@ -39,14 +39,16 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Thread;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Thread;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
-use Cassandane::Util::Log;
 use Data::Dumper;
 
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
+use Cassandane::Util::Log;
+
 sub new
 {
     my $class = shift;
diff --git a/Cassandane/Cyrus/Userid.pm b/Cassandane/Cyrus/Userid.pm
index 039769a2f..1c9198fb0 100644
--- a/Cassandane/Cyrus/Userid.pm
+++ b/Cassandane/Cyrus/Userid.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Userid;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Userid;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
diff --git a/Cassandane/Daemon.pm b/Cassandane/Daemon.pm
index eea7b0b71..a1624b0e2 100644
--- a/Cassandane/Daemon.pm
+++ b/Cassandane/Daemon.pm
@@ -42,6 +42,8 @@
 package Cassandane::Daemon;
 use strict;
 use warnings;
+
+use lib '.';
 use Cassandane::Util::Log;
 use Cassandane::PortManager;
 
diff --git a/Cassandane/Generator.pm b/Cassandane/Generator.pm
index 5ff8d1e34..2822b343f 100644
--- a/Cassandane/Generator.pm
+++ b/Cassandane/Generator.pm
@@ -42,10 +42,12 @@
 package Cassandane::Generator;
 use strict;
 use warnings;
+use Digest::MD5 qw(md5_hex);
+
+use lib '.';
 use Cassandane::Util::DateTime qw(to_rfc822 from_iso8601);
 use Cassandane::Address;
 use Cassandane::Message;
-use Digest::MD5 qw(md5_hex);
 use Cassandane::Util::SHA;
 
 our $admin = 'qa@cyrus.foundation';
diff --git a/Cassandane/IMAPMessageStore.pm b/Cassandane/IMAPMessageStore.pm
index 21fb3f252..852b58138 100644
--- a/Cassandane/IMAPMessageStore.pm
+++ b/Cassandane/IMAPMessageStore.pm
@@ -42,8 +42,10 @@
 package Cassandane::IMAPMessageStore;
 use strict;
 use warnings;
-use base qw(Cassandane::MessageStore);
 use Mail::IMAPTalk;
+
+use lib '.';
+use base qw(Cassandane::MessageStore);
 use Cassandane::Util::Log;
 use Cassandane::Util::DateTime qw(to_rfc822);
 use Cassandane::Util::Socket;
diff --git a/Cassandane/IMAPService.pm b/Cassandane/IMAPService.pm
index f25792dc1..610517fac 100644
--- a/Cassandane/IMAPService.pm
+++ b/Cassandane/IMAPService.pm
@@ -42,6 +42,8 @@
 package Cassandane::IMAPService;
 use strict;
 use warnings;
+
+use lib '.';
 use base qw(Cassandane::Service);
 use Cassandane::Util::Log;
 
diff --git a/Cassandane/Instance.pm b/Cassandane/Instance.pm
index a6ad4e555..57076caae 100644
--- a/Cassandane/Instance.pm
+++ b/Cassandane/Instance.pm
@@ -53,6 +53,13 @@ use IO::Socket::UNIX;
 use DateTime;
 use BSD::Resource;
 use Cwd qw(abs_path getcwd);
+use AnyEvent;
+use AnyEvent::Handle;
+use AnyEvent::Socket;
+use AnyEvent::Util;
+use JSON;
+
+use lib '.';
 use Cassandane::Util::DateTime qw(to_iso8601);
 use Cassandane::Util::Log;
 use Cassandane::Util::Wait;
@@ -64,11 +71,7 @@ use Cassandane::Daemon;
 use Cassandane::MasterStart;
 use Cassandane::MasterEvent;
 use Cassandane::Cassini;
-use AnyEvent;
-use AnyEvent::Handle;
-use AnyEvent::Socket;
-use AnyEvent::Util;
-use JSON;
+require Cyrus::DList;
 
 my $__cached_rootdir;
 my $stamp;
diff --git a/Cassandane/MaildirMessageStore.pm b/Cassandane/MaildirMessageStore.pm
index 53376095f..02e671dbc 100644
--- a/Cassandane/MaildirMessageStore.pm
+++ b/Cassandane/MaildirMessageStore.pm
@@ -42,9 +42,11 @@
 package Cassandane::MaildirMessageStore;
 use strict;
 use warnings;
-use base qw(Cassandane::MessageStore);
 use File::Path qw(mkpath rmtree);
 
+use lib '.';
+use base qw(Cassandane::MessageStore);
+
 sub new
 {
     my ($class, %params) = @_;
diff --git a/Cassandane/MasterEntry.pm b/Cassandane/MasterEntry.pm
index 87d5cde3a..0cd439cc5 100644
--- a/Cassandane/MasterEntry.pm
+++ b/Cassandane/MasterEntry.pm
@@ -42,6 +42,8 @@
 package Cassandane::MasterEntry;
 use strict;
 use warnings;
+
+use lib '.';
 use Cassandane::Util::Log;
 
 my $next_tag = 1;
diff --git a/Cassandane/MasterEvent.pm b/Cassandane/MasterEvent.pm
index c967dad44..c8cd27714 100644
--- a/Cassandane/MasterEvent.pm
+++ b/Cassandane/MasterEvent.pm
@@ -40,10 +40,12 @@
 #
 
 package Cassandane::MasterEvent;
-use base qw(Cassandane::MasterEntry);
 use strict;
 use warnings;
 
+use lib '.';
+use base qw(Cassandane::MasterEntry);
+
 sub new
 {
     return shift->SUPER::new(@_);
diff --git a/Cassandane/MasterStart.pm b/Cassandane/MasterStart.pm
index 41711b9ef..bc569a553 100644
--- a/Cassandane/MasterStart.pm
+++ b/Cassandane/MasterStart.pm
@@ -40,10 +40,12 @@
 #
 
 package Cassandane::MasterStart;
-use base qw(Cassandane::MasterEntry);
 use strict;
 use warnings;
 
+use lib '.';
+use base qw(Cassandane::MasterEntry);
+
 sub new
 {
     return shift->SUPER::new(@_);
diff --git a/Cassandane/MboxMessageStore.pm b/Cassandane/MboxMessageStore.pm
index 9cf340863..8ffe6034d 100644
--- a/Cassandane/MboxMessageStore.pm
+++ b/Cassandane/MboxMessageStore.pm
@@ -42,9 +42,11 @@
 package Cassandane::MboxMessageStore;
 use strict;
 use warnings;
+use POSIX qw(strftime);
+
+use lib '.';
 use base qw(Cassandane::MessageStore);
 use Cassandane::Util::DateTime qw(from_rfc822);
-use POSIX qw(strftime);
 use Cassandane::Message;
 
 sub new
diff --git a/Cassandane/Mboxname.pm b/Cassandane/Mboxname.pm
index 6b90ee41e..7236bffad 100644
--- a/Cassandane/Mboxname.pm
+++ b/Cassandane/Mboxname.pm
@@ -43,6 +43,8 @@ package Cassandane::Mboxname;
 use strict;
 use warnings;
 use overload qw("") => \&to_internal;
+
+use lib '.';
 use Cassandane::Util::Log;
 
 sub new
diff --git a/Cassandane/Message.pm b/Cassandane/Message.pm
index 207fdbf9c..d1ff04f72 100644
--- a/Cassandane/Message.pm
+++ b/Cassandane/Message.pm
@@ -42,11 +42,13 @@
 package Cassandane::Message;
 use strict;
 use warnings;
+use base qw(Clone Exporter);
+use overload qw("") => \&as_string;
+
+use lib '.';
 use Cassandane::Util::Log;
 use Cassandane::Util::DateTime qw(to_rfc3501);
 use Cassandane::Util::SHA;
-use base qw(Clone Exporter);
-use overload qw("") => \&as_string;
 
 our @EXPORT = qw(base_subject);
 
diff --git a/Cassandane/MessageStore.pm b/Cassandane/MessageStore.pm
index df9454848..65c7c6c86 100644
--- a/Cassandane/MessageStore.pm
+++ b/Cassandane/MessageStore.pm
@@ -42,9 +42,11 @@
 package Cassandane::MessageStore;
 use strict;
 use warnings;
-use Cassandane::Util::Log;
 use overload qw("") => \&as_string;
 
+use lib '.';
+use Cassandane::Util::Log;
+
 sub new
 {
     my ($class, %params) = @_;
diff --git a/Cassandane/MessageStoreFactory.pm b/Cassandane/MessageStoreFactory.pm
index b2d786844..3a204ddea 100644
--- a/Cassandane/MessageStoreFactory.pm
+++ b/Cassandane/MessageStoreFactory.pm
@@ -43,14 +43,16 @@ package Cassandane::MessageStoreFactory;
 use strict;
 use warnings;
 use Mail::IMAPTalk;
+use URI;
+use URI::Escape qw(uri_unescape);
+use Exporter ();
+
+use lib '.';
 use Cassandane::MboxMessageStore;
 use Cassandane::MaildirMessageStore;
 use Cassandane::IMAPMessageStore;
 use Cassandane::POP3MessageStore;
-use URI;
-use URI::Escape qw(uri_unescape);
 
-use Exporter ();
 our @ISA = qw(Exporter);
 our @EXPORT = qw(create);
 
diff --git a/Cassandane/POP3MessageStore.pm b/Cassandane/POP3MessageStore.pm
index b506414b2..75772044c 100644
--- a/Cassandane/POP3MessageStore.pm
+++ b/Cassandane/POP3MessageStore.pm
@@ -42,8 +42,10 @@
 package Cassandane::POP3MessageStore;
 use strict;
 use warnings;
-use base qw(Cassandane::MessageStore);
 use Net::POP3;
+
+use lib '.';
+use base qw(Cassandane::MessageStore);
 use Cassandane::Util::Log;
 
 sub new
diff --git a/Cassandane/SequenceGenerator.pm b/Cassandane/SequenceGenerator.pm
index aa6c66c9f..784f4242b 100644
--- a/Cassandane/SequenceGenerator.pm
+++ b/Cassandane/SequenceGenerator.pm
@@ -42,6 +42,8 @@
 package Cassandane::SequenceGenerator;
 use strict;
 use warnings;
+
+use lib '.';
 use base qw(Cassandane::Generator);
 use Cassandane::Util::DateTime qw(to_iso8601);
 use Cassandane::Address;
diff --git a/Cassandane/Service.pm b/Cassandane/Service.pm
index f9d254996..09055a85e 100644
--- a/Cassandane/Service.pm
+++ b/Cassandane/Service.pm
@@ -42,6 +42,8 @@
 package Cassandane::Service;
 use strict;
 use warnings;
+
+use lib '.';
 use base qw(Cassandane::MasterEntry);
 use Cassandane::Daemon;
 use Cassandane::Util::Log;
diff --git a/Cassandane/ServiceFactory.pm b/Cassandane/ServiceFactory.pm
index 5761316f5..03d066a1f 100644
--- a/Cassandane/ServiceFactory.pm
+++ b/Cassandane/ServiceFactory.pm
@@ -42,6 +42,8 @@
 package Cassandane::ServiceFactory;
 use strict;
 use warnings;
+
+use lib '.';
 use Cassandane::Util::Log;
 use Cassandane::Service;
 use Cassandane::IMAPService;
diff --git a/Cassandane/Test/Address.pm b/Cassandane/Test/Address.pm
index ca9286939..067b4531e 100644
--- a/Cassandane/Test/Address.pm
+++ b/Cassandane/Test/Address.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Test::Address;
 use strict;
 use warnings;
-package Cassandane::Test::Address;
+
+use lib '.';
 use base qw(Cassandane::Unit::TestCase);
 use Cassandane::Address;
 
diff --git a/Cassandane/Test/Cassini.pm b/Cassandane/Test/Cassini.pm
index 5821f2917..623f30a04 100644
--- a/Cassandane/Test/Cassini.pm
+++ b/Cassandane/Test/Cassini.pm
@@ -39,12 +39,14 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Test::Cassini;
 use strict;
 use warnings;
-package Cassandane::Test::Cassini;
-use base qw(Cassandane::Unit::TestCase);
 use File::chdir;
 use File::Temp qw(tempdir);
+
+use lib '.';
+use base qw(Cassandane::Unit::TestCase);
 use Cassandane::Cassini;
 use Cassandane::Util::Log;
 
diff --git a/Cassandane/Test/Clone.pm b/Cassandane/Test/Clone.pm
index 655681a8a..bdfaa6117 100644
--- a/Cassandane/Test/Clone.pm
+++ b/Cassandane/Test/Clone.pm
@@ -39,12 +39,14 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Test::Clone;
 use strict;
 use warnings;
-package Cassandane::Test::Clone;
-use base qw(Cassandane::Unit::TestCase);
 use Clone qw(clone);
 
+use lib '.';
+use base qw(Cassandane::Unit::TestCase);
+
 sub new
 {
     my $class = shift;
diff --git a/Cassandane/Test/Config.pm b/Cassandane/Test/Config.pm
index 0dff8481c..eba469490 100644
--- a/Cassandane/Test/Config.pm
+++ b/Cassandane/Test/Config.pm
@@ -39,11 +39,13 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Test::Config;
 use strict;
 use warnings;
-package Cassandane::Test::Config;
-use base qw(Cassandane::Unit::TestCase);
 use File::Temp qw(tempfile);
+
+use lib '.';
+use base qw(Cassandane::Unit::TestCase);
 use Cassandane::Config;
 
 sub new
diff --git a/Cassandane/Test/DateTime.pm b/Cassandane/Test/DateTime.pm
index be61fdd58..6cbe9fa8e 100644
--- a/Cassandane/Test/DateTime.pm
+++ b/Cassandane/Test/DateTime.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Test::DateTime;
 use strict;
 use warnings;
-package Cassandane::Test::DateTime;
+
+use lib '.';
 use base qw(Cassandane::Unit::TestCase);
 use Cassandane::Util::DateTime;
 
diff --git a/Cassandane/Test/Mboxname.pm b/Cassandane/Test/Mboxname.pm
index ae3a52a86..926ade4d4 100644
--- a/Cassandane/Test/Mboxname.pm
+++ b/Cassandane/Test/Mboxname.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Test::Mboxname;
 use strict;
 use warnings;
-package Cassandane::Test::Mboxname;
+
+use lib '.';
 use base qw(Cassandane::Unit::TestCase);
 use Cassandane::Mboxname;
 use Cassandane::Config;
diff --git a/Cassandane/Test/Message.pm b/Cassandane/Test/Message.pm
index e9009613b..2e19a574a 100755
--- a/Cassandane/Test/Message.pm
+++ b/Cassandane/Test/Message.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Test::Message;
 use strict;
 use warnings;
-package Cassandane::Test::Message;
+
+use lib '.';
 use base qw(Cassandane::Unit::TestCase);
 use Cassandane::Message;
 use Cassandane::Address;
diff --git a/Cassandane/Test/MessageStoreFactory.pm b/Cassandane/Test/MessageStoreFactory.pm
index 653b9984c..aade86367 100644
--- a/Cassandane/Test/MessageStoreFactory.pm
+++ b/Cassandane/Test/MessageStoreFactory.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Test::MessageStoreFactory;
 use strict;
 use warnings;
-package Cassandane::Test::MessageStoreFactory;
+
+use lib '.';
 use base qw(Cassandane::Unit::TestCase);
 use Cassandane::MessageStoreFactory;
 
diff --git a/Cassandane/Test/Metronome.pm b/Cassandane/Test/Metronome.pm
index dd4bfa214..e940a26d9 100644
--- a/Cassandane/Test/Metronome.pm
+++ b/Cassandane/Test/Metronome.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Test::Metronome;
 use strict;
 use warnings;
-package Cassandane::Test::Metronome;
+
+use lib '.';
 use base qw(Cassandane::Unit::TestCase);
 use Cassandane::Util::Metronome;
 use Cassandane::Util::Sample;
diff --git a/Cassandane/Test/Parameter.pm b/Cassandane/Test/Parameter.pm
index ccf5bc2ab..aba8e31a5 100644
--- a/Cassandane/Test/Parameter.pm
+++ b/Cassandane/Test/Parameter.pm
@@ -39,11 +39,13 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Test::Parameter;
 use strict;
 use warnings;
-package Cassandane::Test::Parameter;
-use Cassandane::Util::Log;
+
+use lib '.';
 use base qw(Cassandane::Unit::TestCase);
+use Cassandane::Util::Log;
 
 sub new
 {
diff --git a/Cassandane/Test/Sample.pm b/Cassandane/Test/Sample.pm
index c709b3b3f..f41f773d4 100644
--- a/Cassandane/Test/Sample.pm
+++ b/Cassandane/Test/Sample.pm
@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Test::Sample;
 use strict;
 use warnings;
-package Cassandane::Test::Sample;
+
+use lib '.';
 use base qw(Cassandane::Unit::TestCase);
 use Cassandane::Util::Sample;
 use Cassandane::Util::Log;
diff --git a/Cassandane/ThreadedGenerator.pm b/Cassandane/ThreadedGenerator.pm
index d93e893ac..72e30c789 100644
--- a/Cassandane/ThreadedGenerator.pm
+++ b/Cassandane/ThreadedGenerator.pm
@@ -42,6 +42,8 @@
 package Cassandane::ThreadedGenerator;
 use strict;
 use warnings;
+
+use lib '.';
 use base qw(Cassandane::Generator);
 use Cassandane::Address;
 use Cassandane::Message;
diff --git a/Cassandane/Unit/RunnerPretty.pm b/Cassandane/Unit/RunnerPretty.pm
index 4d8088a70..fde4f2235 100644
--- a/Cassandane/Unit/RunnerPretty.pm
+++ b/Cassandane/Unit/RunnerPretty.pm
@@ -42,6 +42,8 @@
 package Cassandane::Unit::RunnerPretty;
 use strict;
 use warnings;
+
+use lib '.';
 use base qw(Cassandane::Unit::Runner);
 
 sub start_test
diff --git a/Cassandane/Unit/TestCase.pm b/Cassandane/Unit/TestCase.pm
index 63f55a976..e2c6111ea 100644
--- a/Cassandane/Unit/TestCase.pm
+++ b/Cassandane/Unit/TestCase.pm
@@ -39,12 +39,15 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Unit::TestCase;
 use strict;
 use warnings;
-package Cassandane::Unit::TestCase;
-# use Cassandane::Util::Log;
+
 use base qw(Test::Unit::TestCase);
 
+# use lib '.';
+# use Cassandane::Util::Log;
+
 my $enabled;
 
 sub new
diff --git a/Cassandane/Unit/TestPlan.pm b/Cassandane/Unit/TestPlan.pm
index 64b01da86..00c5d9860 100644
--- a/Cassandane/Unit/TestPlan.pm
+++ b/Cassandane/Unit/TestPlan.pm
@@ -39,14 +39,15 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Unit::TestPlanItem;
 use strict;
 use warnings;
-use Cassandane::Unit::TestCase;
 use IO::Handle;
 use POSIX;
 use Time::HiRes qw(time);
 
-package Cassandane::Unit::TestPlanItem;
+use lib '.';
+use Cassandane::Unit::TestCase;
 
 sub new
 {
diff --git a/Cassandane/Util/Metronome.pm b/Cassandane/Util/Metronome.pm
index 25f822908..708cac580 100644
--- a/Cassandane/Util/Metronome.pm
+++ b/Cassandane/Util/Metronome.pm
@@ -43,6 +43,8 @@ package Cassandane::Util::Metronome;
 use strict;
 use warnings;
 use Time::HiRes qw(clock_gettime clock_nanosleep CLOCK_MONOTONIC);
+
+use lib '.';
 use Cassandane::Util::Log;
 
 sub new
diff --git a/Cassandane/Util/Setup.pm b/Cassandane/Util/Setup.pm
index 63bcf74ec..3a67f0b47 100644
--- a/Cassandane/Util/Setup.pm
+++ b/Cassandane/Util/Setup.pm
@@ -45,9 +45,11 @@ use warnings;
 use base qw(Exporter);
 use POSIX;
 use User::pwent;
-use Cassandane::Util::Log;
 use Data::Dumper;
 
+use lib '.';
+use Cassandane::Util::Log;
+
 our @EXPORT = qw(&become_cyrus);
 
 my $me = $0;
diff --git a/Cassandane/Util/Socket.pm b/Cassandane/Util/Socket.pm
index 8be377ad4..d2be4c330 100644
--- a/Cassandane/Util/Socket.pm
+++ b/Cassandane/Util/Socket.pm
@@ -46,6 +46,8 @@ use base qw(Exporter);
 use IO::Socket::INET;
 use IO::Socket::INET6;
 use IO::Socket::UNIX;
+
+use lib '.';
 use Cassandane::Util::Log;
 
 our @EXPORT = qw(create_client_socket);
diff --git a/Cassandane/Util/Wait.pm b/Cassandane/Util/Wait.pm
index 494712413..79c03c71c 100644
--- a/Cassandane/Util/Wait.pm
+++ b/Cassandane/Util/Wait.pm
@@ -44,6 +44,8 @@ use strict;
 use warnings;
 use base qw(Exporter);
 use Time::HiRes qw(sleep gettimeofday tv_interval);
+
+use lib '.';
 use Cassandane::Util::Log;
 
 our @EXPORT = qw(&timed_wait);
diff --git a/genmail3.pl b/genmail3.pl
index 3ad67f04e..f0622838b 100755
--- a/genmail3.pl
+++ b/genmail3.pl
@@ -42,6 +42,8 @@
 use strict;
 use warnings;
 use DateTime;
+
+use lib '.';
 use Cassandane::SequenceGenerator;
 use Cassandane::ThreadedGenerator;
 use Cassandane::MessageStoreFactory;
diff --git a/imap-append.pl b/imap-append.pl
index fc7dee7f7..982471a3a 100755
--- a/imap-append.pl
+++ b/imap-append.pl
@@ -42,6 +42,8 @@
 use strict;
 use warnings;
 use DateTime;
+
+use lib '.';
 use Cassandane::Generator;
 use Cassandane::Util::DateTime qw(to_iso8601);
 use Cassandane::MessageStoreFactory;
diff --git a/listmail.pl b/listmail.pl
index e154e50db..fa41e6241 100755
--- a/listmail.pl
+++ b/listmail.pl
@@ -42,6 +42,8 @@
 use strict;
 use warnings;
 use DateTime;
+
+use lib '.';
 use Cassandane::MessageStoreFactory;
 
 sub usage
diff --git a/pop3showafter.pl b/pop3showafter.pl
index 3e7f98ab5..388eb8e8f 100755
--- a/pop3showafter.pl
+++ b/pop3showafter.pl
@@ -43,6 +43,8 @@
 use warnings;
 use DateTime;
 use URI::Escape;
+
+use lib '.';
 use Cassandane::Generator;
 use Cassandane::Util::DateTime qw(to_iso8601 from_iso8601
 				  from_rfc822
diff --git a/split-by-thread.pl b/split-by-thread.pl
index b377d4ac7..886c0a165 100755
--- a/split-by-thread.pl
+++ b/split-by-thread.pl
@@ -42,6 +42,8 @@
 use strict;
 use warnings;
 use DateTime;
+
+use lib '.';
 use Cassandane::MessageStoreFactory;
 
 sub usage
diff --git a/sprinkle.pl b/sprinkle.pl
index 949709e68..fc54565ed 100755
--- a/sprinkle.pl
+++ b/sprinkle.pl
@@ -42,6 +42,8 @@
 use strict;
 use warnings;
 use DateTime;
+
+use lib '.';
 use Cassandane::Util::Log;
 use Cassandane::Util::Words;
 use Cassandane::MessageStoreFactory;
diff --git a/start-instance.pl b/start-instance.pl
index b3b05b075..f065ce675 100755
--- a/start-instance.pl
+++ b/start-instance.pl
@@ -41,6 +41,8 @@
 
 use strict;
 use warnings;
+
+use lib '.';
 use Cassandane::Util::Setup;
 use Cassandane::Util::Log;
 use Cassandane::Config;
diff --git a/utils/annotator.pl b/utils/annotator.pl
index 6aa41990e..94b84a23d 100755
--- a/utils/annotator.pl
+++ b/utils/annotator.pl
@@ -39,14 +39,16 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::AnnotatorDaemon;
 use strict;
 use warnings;
-package Cassandane::AnnotatorDaemon;
 use base qw(Cyrus::Annotator::Daemon);
-use Cassandane::Util::Log;
 use Getopt::Long qw(:config no_ignore_case bundling);
 use POSIX;
 
+use lib '.';
+use Cassandane::Util::Log;
+
 set_verbose(1) if $ENV{CASSANDANE_VERBOSE};
 
 # Hack to work around Net::Server being too dumb to unblock the signals