diff --git a/module/VuFind/tests/unit-tests/src/TagsTest.php b/module/VuFind/tests/unit-tests/src/TagsTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..55ec9c00088d9f4b4318a28e1a3659bb5a5dc62c
--- /dev/null
+++ b/module/VuFind/tests/unit-tests/src/TagsTest.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Tags Test Class
+ *
+ * PHP version 5
+ *
+ * Copyright (C) Villanova University 2010.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @category VuFind2
+ * @package  Tests
+ * @author   Demian Katz <demian.katz@villanova.edu>
+ * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
+ */
+namespace VuFind\Test;
+
+/**
+ * Tags Test Class
+ *
+ * @category VuFind2
+ * @package  Tests
+ * @author   Demian Katz <demian.katz@villanova.edu>
+ * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
+ */
+class TagsTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Test tag parsing
+     *
+     * @return void
+     */
+    public function testTagParsing()
+    {
+        $this->assertEquals(
+            array('this', 'that', 'the other'),
+            \VuFind\Tags::parse('this that "the other"')
+        );
+    }
+
+    /**
+     * Test empty tag parsing
+     *
+     * @return void
+     */
+    public function testEmptyTagParsing()
+    {
+        $this->assertEquals(array(), \VuFind\Tags::parse(''));
+    }
+}
\ No newline at end of file