diff --git a/Makefile.PL b/Makefile.PL
index 9a4e6b5d..07ff26a6 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -81,9 +81,9 @@ print "Writing tests ........ ";
 
 for my $d (qw( t t/e2e ))
 {
-    unless (-d $d)
+    unless (mkdir $d)
     {
-        mkdir $d or die "Cannot mkdir $: $!";
+        die "Cannot mkdir $d: $!" unless -d $d;
     }
 }
 
diff --git a/lib/Devel/Cover.pm b/lib/Devel/Cover.pm
index 56243d21..36c876a8 100755
--- a/lib/Devel/Cover.pm
+++ b/lib/Devel/Cover.pm
@@ -348,9 +348,9 @@ sub import
         $Dir = $1 if Cwd::getcwd() =~ /(.*)/;
     }
 
-    unless (-d $DB)
+    unless (mkdir $DB, 0700)
     {
-        mkdir $DB, 0700 or die "Can't mkdir $DB: $!";
+        die "Can't mkdir $DB: $!" unless -d $DB;
     }
     $DB = $1 if abs_path($DB) =~ /(.*)/;
     Devel::Cover::DB->delete($DB) unless $Merge;
@@ -770,9 +770,9 @@ sub _report
     );
 
     my $dbrun = "$DB/runs";
-    unless (-d $dbrun)
+    unless (mkdir $dbrun, 0700)
     {
-        mkdir $dbrun, 0700 or croak "Can't mkdir $dbrun: $!\n";
+        die "Can't mkdir $dbrun $!" unless -d $dbrun;
     }
     $dbrun .= "/$run";
 
diff --git a/lib/Devel/Cover/DB.pm b/lib/Devel/Cover/DB.pm
index b20a32db..99db4542 100644
--- a/lib/Devel/Cover/DB.pm
+++ b/lib/Devel/Cover/DB.pm
@@ -79,9 +79,9 @@ sub write
     $self->{db} = shift if @_;
 
     croak "No db specified" unless length $self->{db};
-    unless (-d $self->{db})
+    unless (mkdir $self->{db}, 0700)
     {
-        mkdir $self->{db}, 0700 or croak "Can't mkdir $self->{db}: $!\n";
+        croak "Can't mkdir $self->{db}: $!\n" unless -d $self->{db};
     }
     $self->validate_db;
 
diff --git a/lib/Devel/Cover/DB/Structure.pm b/lib/Devel/Cover/DB/Structure.pm
index 1b222011..8fda7557 100644
--- a/lib/Devel/Cover/DB/Structure.pm
+++ b/lib/Devel/Cover/DB/Structure.pm
@@ -88,9 +88,9 @@ sub AUTOLOAD
 sub debuglog {
     my $self = shift;
     my $dir = "$self->{base}/debuglog";
-    unless (-d $dir)
+    unless (mkdir $dir, 0700)
     {
-        mkdir $dir, 0700 or confess "Can't mkdir $dir: $!";
+        confess "Can't mkdir $dir: $!" unless -d $dir;
     }
 
     local $\;
@@ -271,9 +271,9 @@ sub write
     my ($dir) = @_;
     # print STDERR Dumper $self;
     $dir .= "/structure";
-    unless (-d $dir)
+    unless (mkdir $dir, 0700)
     {
-        mkdir $dir, 0700 or croak "Can't mkdir $dir: $!\n";
+        confess "Can't mkdir $dir: $!" unless -d $dir;
     }
     for my $file (sort keys %{$self->{f}})
     {
diff --git a/lib/Devel/Cover/Test.pm b/lib/Devel/Cover/Test.pm
index bb688fa4..cd21ba07 100644
--- a/lib/Devel/Cover/Test.pm
+++ b/lib/Devel/Cover/Test.pm
@@ -76,7 +76,10 @@ sub get_params
     $self->{criteria} =~ s/-\w+//g;
     $self->{cover_db} = "$Devel::Cover::Inc::Base/t/e2e/"
                       . "cover_db_$self->{test}/";
-    mkdir $self->{cover_db};
+    unless (mkdir $self->{cover_db})
+    {
+        die "Can't mkdir $self->{cover_db}: $!" unless -d $self->{cover_db};
+    }
     $self->{cover_parameters} = join(" ", map "-coverage $_",
                                               split " ", $self->{criteria})
                               . " -report text " . $self->{cover_db};