diff --git a/test/export.csv.t b/test/export.csv.t
deleted file mode 100755
index 5d8f39753..000000000
--- a/test/export.csv.t
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /usr/bin/perl
-################################################################################
-## taskwarrior - a command line task list manager.
-##
-## Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
-## All rights reserved.
-##
-## This program is free software; you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free Software
-## Foundation; either version 2 of the License, or (at your option) any later
-## version.
-##
-## This program is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-## FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-## details.
-##
-## You should have received a copy of the GNU General Public License along with
-## this program; if not, write to the
-##
-##     Free Software Foundation, Inc.,
-##     51 Franklin Street, Fifth Floor,
-##     Boston, MA
-##     02110-1301
-##     USA
-##
-################################################################################
-
-use strict;
-use warnings;
-use Test::More tests => 11;
-
-# Create the rc file.
-if (open my $fh, '>', 'export.rc')
-{
-  print $fh "data.location=.\n";
-  close $fh;
-  ok (-r 'export.rc', 'Created export.rc');
-}
-
-# Add two tasks, export, examine result.
-qx{../src/task rc:export.rc add priority:H project:A one};
-qx{../src/task rc:export.rc add +tag1 +tag2 two};
-qx{../src/task rc:export.rc export.csv > ./export.txt};
-
-my @lines;
-if (open my $fh, '<', './export.txt')
-{
-  while (my $line = <$fh>)
-  {
-    next unless $line =~ /^['0-9]/;
-    push @lines, $line;
-  }
-
-  close $fh;
-}
-
-my $line1 = qr/'uuid','status','tags','entry','start','due','recur','end','project','priority','fg','bg','description'\n/;
-my $line2 = qr/'.{8}-.{4}-.{4}-.{4}-.{12}','pending','',\d+,,,,,'A','H',,,'one'\n/;
-my $line3 = qr/'.{8}-.{4}-.{4}-.{4}-.{12}','pending','tag1 tag2',\d+,,,,,,,,,'two'\n/;
-
-like ($lines[0], $line1, "export line one");
-like ($lines[1], $line2, "export line two");
-like ($lines[2], $line3, "export line three");
-
-# Cleanup.
-unlink 'export.txt';
-ok (!-r 'export.txt', 'Removed export.txt');
-
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'export.rc';
-ok (!-r 'export.rc', 'Removed export.rc');
-
-exit 0;
-
diff --git a/test/import.143.t b/test/import.143.t
deleted file mode 100755
index be307d67d..000000000
--- a/test/import.143.t
+++ /dev/null
@@ -1,82 +0,0 @@
-#! /usr/bin/perl
-################################################################################
-## taskwarrior - a command line task list manager.
-##
-## Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
-## All rights reserved.
-##
-## This program is free software; you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free Software
-## Foundation; either version 2 of the License, or (at your option) any later
-## version.
-##
-## This program is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-## FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-## details.
-##
-## You should have received a copy of the GNU General Public License along with
-## this program; if not, write to the
-##
-##     Free Software Foundation, Inc.,
-##     51 Franklin Street, Fifth Floor,
-##     Boston, MA
-##     02110-1301
-##     USA
-##
-################################################################################
-
-use strict;
-use warnings;
-use Test::More tests => 12;
-
-# Create the rc file.
-if (open my $fh, '>', 'import.rc')
-{
-  print $fh "data.location=.\n";
-  close $fh;
-  ok (-r 'import.rc', 'Created import.rc');
-}
-
-# Create import file.
-if (open my $fh, '>', 'import.txt')
-{
-  print $fh "'id','status','tags','entry','start','due','end','project','priority','fg','bg','description'\n",
-            "'7f7a4191-c2f2-487f-8855-7a1eb378c267','pending','',1238037947,,,,'A','M',,,'foo bar'\n",
-            "'7f7a4191-c2f2-487f-8855-7a1eb378c268','pending','',1238037947,,,,'A','M',,,'foo, bar'\n",
-            "\n";
-  close $fh;
-  ok (-r 'import.txt', 'Created sample import data');
-}
-
-my $output = qx{../src/task rc:import.rc import import.txt};
-like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
-
-$output = qx{../src/task rc:import.rc list};
-like ($output, qr/1.+A.+M.+foo bar/,  't1');
-like ($output, qr/2.+A.+M.+foo, bar/, 't2');
-
-# Cleanup.
-unlink 'import.txt';
-ok (!-r 'import.txt', 'Removed import.txt');
-
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'import.rc';
-ok (!-r 'import.rc', 'Removed import.rc');
-
-exit 0;
-
diff --git a/test/import.150.t b/test/import.150.t
deleted file mode 100755
index bc7079bad..000000000
--- a/test/import.150.t
+++ /dev/null
@@ -1,82 +0,0 @@
-#! /usr/bin/perl
-################################################################################
-## taskwarrior - a command line task list manager.
-##
-## Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
-## All rights reserved.
-##
-## This program is free software; you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free Software
-## Foundation; either version 2 of the License, or (at your option) any later
-## version.
-##
-## This program is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-## FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-## details.
-##
-## You should have received a copy of the GNU General Public License along with
-## this program; if not, write to the
-##
-##     Free Software Foundation, Inc.,
-##     51 Franklin Street, Fifth Floor,
-##     Boston, MA
-##     02110-1301
-##     USA
-##
-################################################################################
-
-use strict;
-use warnings;
-use Test::More tests => 12;
-
-# Create the rc file.
-if (open my $fh, '>', 'import.rc')
-{
-  print $fh "data.location=.\n";
-  close $fh;
-  ok (-r 'import.rc', 'Created import.rc');
-}
-
-# Create import file.
-if (open my $fh, '>', 'import.txt')
-{
-  print $fh "'id','uuid','status','tags','entry','start','due','recur','end','project','priority','fg','bg','description'\n",
-            "'7f7a4191-c2f2-487f-8855-7a1eb378c267','pending','',1238037947,,,,,'A','M',,,'foo bar'\n",
-            "'7f7a4191-c2f2-487f-8855-7a1eb378c268','pending','',1238037947,,,,,'A','M',,,'foo, bar'\n",
-            "\n";
-  close $fh;
-  ok (-r 'import.txt', 'Created sample import data');
-}
-
-my $output = qx{../src/task rc:import.rc import import.txt};
-like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
-
-$output = qx{../src/task rc:import.rc list};
-like ($output, qr/1.+A.+M.+foo bar/,  't1');
-like ($output, qr/2.+A.+M.+foo, bar/, 't2');
-
-# Cleanup.
-unlink 'import.txt';
-ok (!-r 'import.txt', 'Removed import.txt');
-
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'import.rc';
-ok (!-r 'import.rc', 'Removed import.rc');
-
-exit 0;
-
diff --git a/test/import.160.t b/test/import.160.t
deleted file mode 100755
index d5561cf10..000000000
--- a/test/import.160.t
+++ /dev/null
@@ -1,82 +0,0 @@
-#! /usr/bin/perl
-################################################################################
-## taskwarrior - a command line task list manager.
-##
-## Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
-## All rights reserved.
-##
-## This program is free software; you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free Software
-## Foundation; either version 2 of the License, or (at your option) any later
-## version.
-##
-## This program is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-## FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-## details.
-##
-## You should have received a copy of the GNU General Public License along with
-## this program; if not, write to the
-##
-##     Free Software Foundation, Inc.,
-##     51 Franklin Street, Fifth Floor,
-##     Boston, MA
-##     02110-1301
-##     USA
-##
-################################################################################
-
-use strict;
-use warnings;
-use Test::More tests => 12;
-
-# Create the rc file.
-if (open my $fh, '>', 'import.rc')
-{
-  print $fh "data.location=.\n";
-  close $fh;
-  ok (-r 'import.rc', 'Created import.rc');
-}
-
-# Create import file.
-if (open my $fh, '>', 'import.txt')
-{
-  print $fh "'uuid','status','tags','entry','start','due','recur','end','project','priority','fg','bg','description'\n",
-            "'7f7a4191-c2f2-487f-8855-7a1eb378c267','pending','',1238037947,,,,,'A','M',,,'foo bar'\n",
-            "'7f7a4191-c2f2-487f-8855-7a1eb378c268','pending','',1238037947,,,,,'A','M',,,'foo, bar'\n",
-            "\n";
-  close $fh;
-  ok (-r 'import.txt', 'Created sample import data');
-}
-
-my $output = qx{../src/task rc:import.rc import import.txt};
-like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
-
-$output = qx{../src/task rc:import.rc list};
-like ($output, qr/1.+A.+M.+foo bar/,  't1');
-like ($output, qr/2.+A.+M.+foo, bar/, 't2');
-
-# Cleanup.
-unlink 'import.txt';
-ok (!-r 'import.txt', 'Removed import.txt');
-
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'import.rc';
-ok (!-r 'import.rc', 'Removed import.rc');
-
-exit 0;
-
diff --git a/test/import.cmd.t b/test/import.cmd.t
deleted file mode 100755
index 8a081a136..000000000
--- a/test/import.cmd.t
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /usr/bin/perl
-################################################################################
-## taskwarrior - a command line task list manager.
-##
-## Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
-## All rights reserved.
-##
-## This program is free software; you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free Software
-## Foundation; either version 2 of the License, or (at your option) any later
-## version.
-##
-## This program is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-## FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-## details.
-##
-## You should have received a copy of the GNU General Public License along with
-## this program; if not, write to the
-##
-##     Free Software Foundation, Inc.,
-##     51 Franklin Street, Fifth Floor,
-##     Boston, MA
-##     02110-1301
-##     USA
-##
-################################################################################
-
-use strict;
-use warnings;
-use Test::More tests => 12;
-
-# Create the rc file.
-if (open my $fh, '>', 'import.rc')
-{
-  print $fh "data.location=.\n";
-  close $fh;
-  ok (-r 'import.rc', 'Created import.rc');
-}
-
-# Create import file.
-if (open my $fh, '>', 'import.txt')
-{
-  print $fh "This is a test priority:H project:A\n",
-            "Another task\n",
-            "\n";
-  close $fh;
-  ok (-r 'import.txt', 'Created sample import data');
-}
-
-my $output = qx{../src/task rc:import.rc import import.txt};
-like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
-
-$output = qx{../src/task rc:import.rc list};
-like ($output, qr/1.+A.+H.+This is a test/, 't1');
-like ($output, qr/2.+Another task/,         't2');
-
-# Cleanup.
-unlink 'import.txt';
-ok (!-r 'import.txt', 'Removed import.txt');
-
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'import.rc';
-ok (!-r 'import.rc', 'Removed import.rc');
-
-exit 0;
-
diff --git a/test/import.csv.t b/test/import.csv.t
deleted file mode 100755
index 0789ec2e5..000000000
--- a/test/import.csv.t
+++ /dev/null
@@ -1,82 +0,0 @@
-#! /usr/bin/perl
-################################################################################
-## taskwarrior - a command line task list manager.
-##
-## Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
-## All rights reserved.
-##
-## This program is free software; you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free Software
-## Foundation; either version 2 of the License, or (at your option) any later
-## version.
-##
-## This program is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-## FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-## details.
-##
-## You should have received a copy of the GNU General Public License along with
-## this program; if not, write to the
-##
-##     Free Software Foundation, Inc.,
-##     51 Franklin Street, Fifth Floor,
-##     Boston, MA
-##     02110-1301
-##     USA
-##
-################################################################################
-
-use strict;
-use warnings;
-use Test::More tests => 12;
-
-# Create the rc file.
-if (open my $fh, '>', 'import.rc')
-{
-  print $fh "data.location=.\n";
-  close $fh;
-  ok (-r 'import.rc', 'Created import.rc');
-}
-
-# Create import file.
-if (open my $fh, '>', 'import.txt')
-{
-  print $fh "'id','priority','description'\n",
-            "1,H,'this is a test'\n",
-            "2,,'another task'\n",
-            "\n";
-  close $fh;
-  ok (-r 'import.txt', 'Created sample import data');
-}
-
-my $output = qx{../src/task rc:import.rc import import.txt};
-like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
-
-$output = qx{../src/task rc:import.rc list};
-like ($output, qr/1.+H.+this is a test/, 't1');
-like ($output, qr/2.+another task/,      't2');
-
-# Cleanup.
-unlink 'import.txt';
-ok (!-r 'import.txt', 'Removed import.txt');
-
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'import.rc';
-ok (!-r 'import.rc', 'Removed import.rc');
-
-exit 0;
-
diff --git a/test/import.txt.t b/test/import.txt.t
deleted file mode 100755
index 1164f7bbc..000000000
--- a/test/import.txt.t
+++ /dev/null
@@ -1,83 +0,0 @@
-#! /usr/bin/perl
-################################################################################
-## taskwarrior - a command line task list manager.
-##
-## Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
-## All rights reserved.
-##
-## This program is free software; you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free Software
-## Foundation; either version 2 of the License, or (at your option) any later
-## version.
-##
-## This program is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-## FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-## details.
-##
-## You should have received a copy of the GNU General Public License along with
-## this program; if not, write to the
-##
-##     Free Software Foundation, Inc.,
-##     51 Franklin Street, Fifth Floor,
-##     Boston, MA
-##     02110-1301
-##     USA
-##
-################################################################################
-
-use strict;
-use warnings;
-use Test::More tests => 13;
-
-# Create the rc file.
-if (open my $fh, '>', 'import.rc')
-{
-  print $fh "data.location=.\n";
-  close $fh;
-  ok (-r 'import.rc', 'Created import.rc');
-}
-
-# Create import file.
-if (open my $fh, '>', 'import.txt')
-{
-  print $fh "Get milk, bread\n",
-            "Order cake\n",
-            "Clean house\n",
-            "\n";
-  close $fh;
-  ok (-r 'import.txt', 'Created sample import data');
-}
-
-my $output = qx{../src/task rc:import.rc import import.txt};
-like ($output, qr/Imported 3 tasks successfully, with 0 errors./, 'no errors');
-
-$output = qx{../src/task rc:import.rc list};
-like ($output, qr/1.+Get milk, bread/, 't1');
-like ($output, qr/2.+Order cake/,      't2');
-like ($output, qr/3.+Clean house/,     't3');
-
-# Cleanup.
-unlink 'import.txt';
-ok (!-r 'import.txt', 'Removed import.txt');
-
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'import.rc';
-ok (!-r 'import.rc', 'Removed import.rc');
-
-exit 0;
-
diff --git a/test/import.url.t b/test/import.url.t
deleted file mode 100755
index d4680047b..000000000
--- a/test/import.url.t
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /usr/bin/perl
-################################################################################
-## taskwarrior - a command line task list manager.
-##
-## Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
-## All rights reserved.
-##
-## This program is free software; you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free Software
-## Foundation; either version 2 of the License, or (at your option) any later
-## version.
-##
-## This program is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-## FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-## details.
-##
-## You should have received a copy of the GNU General Public License along with
-## this program; if not, write to the
-##
-##     Free Software Foundation, Inc.,
-##     51 Franklin Street, Fifth Floor,
-##     Boston, MA
-##     02110-1301
-##     USA
-##
-################################################################################
-
-use strict;
-use warnings;
-use Test::More tests => 10;
-
-# Create the rc file.
-if (open my $fh, '>', 'import.rc')
-{
-  print $fh "data.location=.\n";
-  close $fh;
-  ok (-r 'import.rc', 'Created import.rc');
-}
-
-my $output = qx{../src/task rc:import.rc import http://tasktools.org/import.txt};
-like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
-
-$output = qx{../src/task rc:import.rc list};
-like ($output, qr/1.+A.+H.+This is a test/, 't1');
-like ($output, qr/2.+Another task/,         't2');
-
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'import.rc';
-ok (!-r 'import.rc', 'Removed import.rc');
-
-exit 0;
-