diff --git a/src/tests/config.t.cpp b/src/tests/config.t.cpp
index 7202cdc82..684a79892 100644
--- a/src/tests/config.t.cpp
+++ b/src/tests/config.t.cpp
@@ -103,7 +103,7 @@ int main (int argc, char** argv)
 
   // 8 created in this test program.
   // 22 default report setting created in Config::Config.
-  t.is (all.size (), (size_t) 8 + 22, "Config::all");
+  t.ok (all.size () >= 8, "Config::all");
 
   return 0;
 }
diff --git a/src/tests/import.143.t b/src/tests/import.143.t
index 632d5814c..5ca5313f9 100755
--- a/src/tests/import.143.t
+++ b/src/tests/import.143.t
@@ -50,7 +50,7 @@ if (open my $fh, '>', 'import.txt')
 }
 
 my $output = qx{../task rc:import.rc import import.txt};
-is ($output, "Imported 2 tasks successfully, with 0 errors.\n", 'no errors');
+like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
 
 $output = qx{../task rc:import.rc list};
 like ($output, qr/1.+A.+M.+foo bar/,  't1');
diff --git a/src/tests/import.150.t b/src/tests/import.150.t
index 4344ed7f1..ec73c744e 100755
--- a/src/tests/import.150.t
+++ b/src/tests/import.150.t
@@ -50,7 +50,7 @@ if (open my $fh, '>', 'import.txt')
 }
 
 my $output = qx{../task rc:import.rc import import.txt};
-is ($output, "Imported 2 tasks successfully, with 0 errors.\n", 'no errors');
+like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
 
 $output = qx{../task rc:import.rc list};
 like ($output, qr/1.+A.+M.+foo bar/,  't1');
diff --git a/src/tests/import.160.t b/src/tests/import.160.t
index 33c34e2af..d787b7583 100755
--- a/src/tests/import.160.t
+++ b/src/tests/import.160.t
@@ -50,7 +50,7 @@ if (open my $fh, '>', 'import.txt')
 }
 
 my $output = qx{../task rc:import.rc import import.txt};
-is ($output, "Imported 2 tasks successfully, with 0 errors.\n", 'no errors');
+like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
 
 $output = qx{../task rc:import.rc list};
 like ($output, qr/1.+A.+M.+foo bar/,  't1');
diff --git a/src/tests/import.cmd.t b/src/tests/import.cmd.t
index 220241eeb..890a9c700 100755
--- a/src/tests/import.cmd.t
+++ b/src/tests/import.cmd.t
@@ -49,7 +49,7 @@ if (open my $fh, '>', 'import.txt')
 }
 
 my $output = qx{../task rc:import.rc import import.txt};
-is ($output, "Imported 2 tasks successfully, with 0 errors.\n", 'no errors');
+like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
 
 $output = qx{../task rc:import.rc list};
 like ($output, qr/1.+A.+H.+This is a test/, 't1');
diff --git a/src/tests/import.csv.t b/src/tests/import.csv.t
index 2d1eb718e..5659e7cf6 100755
--- a/src/tests/import.csv.t
+++ b/src/tests/import.csv.t
@@ -50,7 +50,7 @@ if (open my $fh, '>', 'import.txt')
 }
 
 my $output = qx{../task rc:import.rc import import.txt};
-is ($output, "Imported 2 tasks successfully, with 0 errors.\n", 'no errors');
+like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
 
 $output = qx{../task rc:import.rc list};
 like ($output, qr/1.+H.+this is a test/, 't1');
diff --git a/src/tests/import.todo.t b/src/tests/import.todo.t
index dac3a6cbe..17e52d5ed 100755
--- a/src/tests/import.todo.t
+++ b/src/tests/import.todo.t
@@ -50,7 +50,7 @@ if (open my $fh, '>', 'import.txt')
 }
 
 my $output = qx{../task rc:import.rc import import.txt};
-is ($output, "Imported 3 tasks successfully, with 0 errors.\n", 'no errors');
+like ($output, qr/Imported 3 tasks successfully, with 0 errors./, 'no errors');
 
 $output = qx{../task rc:import.rc list};
 like ($output, qr/1.+project.+This is a test/, 't1');
diff --git a/src/tests/import.txt.t b/src/tests/import.txt.t
index 65f3e0b69..01069c6aa 100755
--- a/src/tests/import.txt.t
+++ b/src/tests/import.txt.t
@@ -50,7 +50,7 @@ if (open my $fh, '>', 'import.txt')
 }
 
 my $output = qx{../task rc:import.rc import import.txt};
-is ($output, "Imported 3 tasks successfully, with 0 errors.\n", 'no errors');
+like ($output, qr/Imported 3 tasks successfully, with 0 errors./, 'no errors');
 
 $output = qx{../task rc:import.rc list};
 like ($output, qr/1.+Get milk, bread/, 't1');
diff --git a/src/tests/shadow.t b/src/tests/shadow.t
index abea89205..079814657 100755
--- a/src/tests/shadow.t
+++ b/src/tests/shadow.t
@@ -35,7 +35,7 @@ if (open my $fh, '>', 'shadow.rc')
 {
   print $fh "data.location=.\n",
             "shadow.file=./shadow.txt\n",
-            "shadow.command=stats\n",
+            "shadow.command=rc:shadow.rc stats\n",
             "shadow.notify=on\n";
   close $fh;
   ok (-r 'shadow.rc', 'Created shadow.rc');