diff --git a/test/bug.414.t b/test/bug.414.t
deleted file mode 100755
index 7bac95b69..000000000
--- a/test/bug.414.t
+++ /dev/null
@@ -1,69 +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 => 5;
-
-# Ensure environment has no influence.
-delete $ENV{'TASKDATA'};
-delete $ENV{'TASKRC'};
-
-use File::Basename;
-my $ut = basename ($0);
-my $rc = $ut . '.rc';
-
-# Create the rc file.
-if (open my $fh, '>', $rc)
-{
-  print $fh "data.location=.\n";
-  close $fh;
-}
-
-# Bug #414: Tags filtering not working with unicode characters
-
-# Add a task with a UTF-8 tag.
-qx{../src/task rc:$rc add one +osobní 2>&1};
-my $output = qx{../src/task rc:$rc ls +osobní 2>&1};
-like ($output, qr/one/,   "$ut: found UTF8 tag osobní");
-
-$output = qx{../src/task rc:$rc ls -osobní 2>&1};
-like ($output, qr/^No matches.$/m, "$ut: not found UTF8 tag osobní");
-
-# And a different one
-qx{../src/task rc:$rc add two +föo 2>&1};
-$output = qx{../src/task rc:$rc ls +föo 2>&1};
-like ($output, qr/two/,   "$ut: found UTF8 tag föo");
-
-$output = qx{../src/task rc:$rc ls -föo 2>&1};
-like   ($output, qr/one/, "$ut: found UTF8 tag osobní");
-unlike ($output, qr/two/, "$ut: not found UTF8 tag föo");
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
-
diff --git a/test/encoding.t b/test/encoding.t
new file mode 100755
index 000000000..66d910b25
--- /dev/null
+++ b/test/encoding.t
@@ -0,0 +1,66 @@
+#!/usr/bin/env python2.7
+# -*- coding: utf-8 -*-
+###############################################################################
+#
+# 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
+#
+###############################################################################
+
+import sys
+import os
+import unittest
+# Ensure python finds the local simpletap module
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
+from basetest import Task, TestCase
+
+
+class TestUtf8(TestCase):
+    def setUp(self):
+        self.t = Task()
+
+    def test_utf8_tags(self):
+        """Correct handling of UTF8 characters"""
+        self.t(("add", "one", "+osobní"))
+
+        code, out, err = self.t(("list", "+osobní"))
+        self.assertIn("one", out)
+
+        code, out, err = self.t.runError(("list", "-osobní"))
+        self.assertNotIn("one", out)
+
+        self.t(("add", "two", "+föo"))
+        code, out, err = self.t(("list", "+föo"))
+        self.assertIn("two", out)
+        self.assertNotIn("one", out)
+
+        code, out, err = self.t(("list", "-föo"))
+        self.assertNotIn("two", out)
+        self.assertIn("one", out)
+
+
+if __name__ == "__main__":
+    from simpletap import TAPTestRunner
+    unittest.main(testRunner=TAPTestRunner())
+
+# vim: ai sts=4 et sw=4