diff --git a/test/list.all.tags.t b/test/list.all.tags.t
deleted file mode 100755
index 61092c5bd..000000000
--- a/test/list.all.tags.t
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /usr/bin/env perl
-################################################################################
-##
-## Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez.
-##
-## Permission is hereby granted, free of charge, to any person obtaining a copy
-## of this software and associated documentation files (the "Software"), to deal
-## in the Software without restriction, including without limitation the rights
-## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-## copies of the Software, and to permit persons to whom the Software is
-## furnished to do so, subject to the following conditions:
-##
-## The above copyright notice and this permission notice shall be included
-## in all copies or substantial portions of the Software.
-##
-## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-## SOFTWARE.
-##
-## http://www.opensource.org/licenses/mit-license.php
-##
-################################################################################
-
-use strict;
-use warnings;
-use Test::More tests => 6;
-
-# Ensure environment has no influence.
-delete $ENV{'TASKDATA'};
-delete $ENV{'TASKRC'};
-
-# Create the rc file.
-if (open my $fh, '>', 'tags.rc')
-{
-  print $fh "data.location=.\n",
-            "defaultwidth=100\n";
-  close $fh;
-}
-
-# Create a data set of two tasks, with unique project names, one
-# pending, one completed.
-qx{../src/task rc:tags.rc add +t1 one 2>&1};
-qx{../src/task rc:tags.rc add +t2 two 2>&1};
-qx{../src/task rc:tags.rc 1 done 2>&1};
-my $output = qx{../src/task rc:tags.rc long 2>&1};
-unlike ($output, qr/t1/, 't1 done');
-like ($output, qr/t2/, 't2 pending');
-
-$output = qx{../src/task rc:tags.rc tags 2>&1};
-unlike ($output, qr/t1/, 't1 done');
-like ($output, qr/t2/, 't2 pending');
-
-$output = qx{../src/task rc:tags.rc rc.list.all.tags:yes tags 2>&1};
-like ($output, qr/t1/, 't1 listed');
-like ($output, qr/t2/, 't2 listed');
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data  tags.rc);
-exit 0;
-
diff --git a/test/tag.t b/test/tag.t
index c2c6e664f..7b20691e5 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -382,6 +382,31 @@ class TestDuplicateTags(TestCase):
         self.assertEqual("A,B,C\n", out)
 
 
+class TestListAllTags(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def test_list_all_tags(self):
+        """Verify the 'tags' command obeys 'rc.list.all.tags'
+
+           Create a data set of two tasks, with unique tags, one
+           pending, one completed.
+        """
+        self.t("add +t1 one")
+        self.t("add +t2 two")
+        self.t("1 done")
+        self.t("list") # GC/handleRecurrence
+
+        code, out, err = self.t("rc.verbose:nothing tags")
+        self.assertNotIn("t1", out)
+        self.assertIn("t2", out)
+
+        code, out, err = self.t("rc.verbose:nothing rc.list.all.tags:yes tags")
+        self.assertIn("t1", out)
+        self.assertIn("t2", out)
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())