diff --git a/test/op_and.t b/test/op_and.t
new file mode 100755
index 000000000..7d7776956
--- /dev/null
+++ b/test/op_and.t
@@ -0,0 +1,105 @@
+#! /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 => 31;
+
+# Create the rc file.
+if (open my $fh, '>', 'op.rc')
+{
+  print $fh "data.location=.\n",
+            "confirmation=no\n";
+  close $fh;
+  ok (-r 'op.rc', 'Created op.rc');
+}
+
+# Setup: Add a task
+qx{../src/task rc:op.rc add one   project:A priority:H};
+qx{../src/task rc:op.rc add two   project:A           };
+qx{../src/task rc:op.rc add three           priority:H};
+qx{../src/task rc:op.rc add four                      };
+
+# Test the 'and' operator.
+my $output = qx{../src/task rc:op.rc ls project:A priority:H};
+like   ($output, qr/one/,   'ls project:A priority:H --> one');
+unlike ($output, qr/two/,   'ls project:A priority:H --> !two');
+unlike ($output, qr/three/, 'ls project:A priority:H --> !three');
+unlike ($output, qr/four/,  'ls project:A priority:H --> !four');
+
+$output = qx{../src/task rc:op.rc ls project:A and priority:H};
+like   ($output, qr/one/,   'ls project:A priority:H --> one');
+unlike ($output, qr/two/,   'ls project:A priority:H --> !two');
+unlike ($output, qr/three/, 'ls project:A priority:H --> !three');
+unlike ($output, qr/four/,  'ls project:A priority:H --> !four');
+
+$output = qx{../src/task rc:op.rc ls project:A and priority.not:H};
+unlike ($output, qr/one/,   'ls project:A priority:H --> !one');
+like   ($output, qr/two/,   'ls project:A priority:H --> two');
+unlike ($output, qr/three/, 'ls project:A priority:H --> !three');
+unlike ($output, qr/four/,  'ls project:A priority:H --> !four');
+
+$output = qx{../src/task rc:op.rc ls project=A priority=H};
+like   ($output, qr/one/,   'ls project:A priority:H --> one');
+unlike ($output, qr/two/,   'ls project:A priority:H --> !two');
+unlike ($output, qr/three/, 'ls project:A priority:H --> !three');
+unlike ($output, qr/four/,  'ls project:A priority:H --> !four');
+
+$output = qx{../src/task rc:op.rc ls project=A and priority=H};
+like   ($output, qr/one/,   'ls project:A priority:H --> one');
+unlike ($output, qr/two/,   'ls project:A priority:H --> !two');
+unlike ($output, qr/three/, 'ls project:A priority:H --> !three');
+unlike ($output, qr/four/,  'ls project:A priority:H --> !four');
+
+$output = qx{../src/task rc:op.rc ls project=A and priotity!=H};
+unlike ($output, qr/one/,   'ls project:A priority:H --> !one');
+like   ($output, qr/two/,   'ls project:A priority:H --> two');
+unlike ($output, qr/three/, 'ls project:A priority:H --> !three');
+unlike ($output, qr/four/,  'ls project:A priority:H --> !four');
+
+# Cleanup.
+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 'op.rc';
+ok (!-r 'op.rc', 'Removed op.rc');
+
+exit 0;
+
diff --git a/test/op_or.t b/test/op_or.t
new file mode 100755
index 000000000..9e92e1d67
--- /dev/null
+++ b/test/op_or.t
@@ -0,0 +1,93 @@
+#! /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 => 23;
+
+# Create the rc file.
+if (open my $fh, '>', 'op.rc')
+{
+  print $fh "data.location=.\n",
+            "confirmation=no\n";
+  close $fh;
+  ok (-r 'op.rc', 'Created op.rc');
+}
+
+# Setup: Add a task
+qx{../src/task rc:op.rc add one   project:A priority:H};
+qx{../src/task rc:op.rc add two   project:A           };
+qx{../src/task rc:op.rc add three           priority:H};
+qx{../src/task rc:op.rc add four                      };
+
+# Test the 'or' operator.
+my $output = qx{../src/task rc:op.rc ls project:A or priority:H};
+like   ($output, qr/one/,   'ls project:A priority:H --> one');
+like   ($output, qr/two/,   'ls project:A priority:H --> two');
+like   ($output, qr/three/, 'ls project:A priority:H --> three');
+unlike ($output, qr/four/,  'ls project:A priority:H --> !four');
+
+$output = qx{../src/task rc:op.rc ls project:A or priority=H};
+like   ($output, qr/one/,   'ls project:A priority=H --> one');
+like   ($output, qr/two/,   'ls project:A priority=H --> two');
+like   ($output, qr/three/, 'ls project:A priority=H --> three');
+unlike ($output, qr/four/,  'ls project:A priority=H --> !four');
+
+$output = qx{../src/task rc:op.rc ls project=A or priority:H};
+like   ($output, qr/one/,   'ls project=A priority:H --> one');
+like   ($output, qr/two/,   'ls project=A priority:H --> two');
+like   ($output, qr/three/, 'ls project=A priority:H --> three');
+unlike ($output, qr/four/,  'ls project=A priority:H --> !four');
+
+$output = qx{../src/task rc:op.rc ls project=A or priority=H};
+like   ($output, qr/one/,   'ls project=A priority=H --> one');
+like   ($output, qr/two/,   'ls project=A priority=H --> two');
+like   ($output, qr/three/, 'ls project=A priority=H --> three');
+unlike ($output, qr/four/,  'ls project=A priority=H --> !four');
+
+# Cleanup.
+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 'op.rc';
+ok (!-r 'op.rc', 'Removed op.rc');
+
+exit 0;
+
diff --git a/test/op_xor.t b/test/op_xor.t
new file mode 100755
index 000000000..7fbf1244a
--- /dev/null
+++ b/test/op_xor.t
@@ -0,0 +1,93 @@
+#! /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 => 23;
+
+# Create the rc file.
+if (open my $fh, '>', 'op.rc')
+{
+  print $fh "data.location=.\n",
+            "confirmation=no\n";
+  close $fh;
+  ok (-r 'op.rc', 'Created op.rc');
+}
+
+# Setup: Add a task
+qx{../src/task rc:op.rc add one   project:A priority:H};
+qx{../src/task rc:op.rc add two   project:A           };
+qx{../src/task rc:op.rc add three           priority:H};
+qx{../src/task rc:op.rc add four                      };
+
+# Test the 'xor' operator.
+my $output = qx{../src/task rc:op.rc ls project:A xor priority:H};
+unlike ($output, qr/one/,   'ls project:A priority:H --> !one');
+like   ($output, qr/two/,   'ls project:A priority:H --> two');
+like   ($output, qr/three/, 'ls project:A priority:H --> three');
+unlike ($output, qr/four/,  'ls project:A priority:H --> !four');
+
+$output = qx{../src/task rc:op.rc ls project:A xor priority=H};
+unlike ($output, qr/one/,   'ls project:A priority=H --> !one');
+like   ($output, qr/two/,   'ls project:A priority=H --> two');
+like   ($output, qr/three/, 'ls project:A priority=H --> three');
+unlike ($output, qr/four/,  'ls project:A priority=H --> !four');
+
+$output = qx{../src/task rc:op.rc ls project=A xor priority:H};
+unlike ($output, qr/one/,   'ls project=A priority:H --> !one');
+like   ($output, qr/two/,   'ls project=A priority:H --> two');
+like   ($output, qr/three/, 'ls project=A priority:H --> three');
+unlike ($output, qr/four/,  'ls project=A priority:H --> !four');
+
+$output = qx{../src/task rc:op.rc ls project=A xor priority=H};
+unlike ($output, qr/one/,   'ls project=A priority=H --> !one');
+like   ($output, qr/two/,   'ls project=A priority=H --> two');
+like   ($output, qr/three/, 'ls project=A priority=H --> three');
+unlike ($output, qr/four/,  'ls project=A priority=H --> !four');
+
+# Cleanup.
+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 'op.rc';
+ok (!-r 'op.rc', 'Removed op.rc');
+
+exit 0;
+