diff --git a/tests/Query/RegistryTestCase.php b/tests/Query/RegistryTestCase.php
new file mode 100644
index 000000000..97ca97a8a
--- /dev/null
+++ b/tests/Query/RegistryTestCase.php
@@ -0,0 +1,43 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.com>.
+ */
+
+/**
+ * Doctrine_Query_Registry_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Registry_TestCase
+{
+    public function testAddingQueries()
+    {
+        $registry = new Doctrine_Query_Registry();
+
+        $registry->add('all-users', 'SELECT u.* FROM User u');
+
+        $this->assertEqual($registry->get('all-users')->getDql(), 'SELECT u.* FROM User u');
+    }
+}
diff --git a/tests/run.php b/tests/run.php
index 4335dc6ff..ef8b90258 100644
--- a/tests/run.php
+++ b/tests/run.php
@@ -223,12 +223,13 @@ $data_types->addTestCase(new Doctrine_DataType_Boolean_TestCase());
 $test->addTestCase($data_types);
 
 // Utility components
-$utility = new GroupTest('Utility tests: View, Validator, Hook');
+$plugins = new GroupTest('Plugin tests: View, Validator, Hook');
 //$utility->addTestCase(new Doctrine_PessimisticLocking_TestCase());
-$utility->addTestCase(new Doctrine_View_TestCase());
-$utility->addTestCase(new Doctrine_Validator_TestCase());
-$utility->addTestCase(new Doctrine_Hook_TestCase());
-$test->addTestCase($utility);
+$plugins->addTestCase(new Doctrine_View_TestCase());
+$plugins->addTestCase(new Doctrine_Validator_TestCase());
+$plugins->addTestCase(new Doctrine_Hook_TestCase());
+$plugins->addTestCase(new Doctrine_I18n_TestCase());
+$test->addTestCase($plugins);
 
 // Db component
 $db = new GroupTest('Db tests: Db and Profiler');
@@ -274,6 +275,7 @@ $query_tests->addTestCase(new Doctrine_Query_MysqlSubquery_TestCase());
 $query_tests->addTestCase(new Doctrine_Query_PgsqlSubquery_TestCase());
 $query_tests->addTestCase(new Doctrine_Query_MysqlSubqueryHaving_TestCase());
 $query_tests->addTestCase(new Doctrine_Query_SelectExpression_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Registry_TestCase());
 $test->addTestCase($query_tests);
 
 // Record