diff --git a/vendor/Joomla/Filter/Tests/JFilterInputTest.php b/vendor/Joomla/Filter/Tests/InputTest.php
similarity index 99%
rename from vendor/Joomla/Filter/Tests/JFilterInputTest.php
rename to vendor/Joomla/Filter/Tests/InputTest.php
index 9a438558a..7560c8672 100644
--- a/vendor/Joomla/Filter/Tests/JFilterInputTest.php
+++ b/vendor/Joomla/Filter/Tests/InputTest.php
@@ -5,7 +5,10 @@
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
+namespace Joomla\Filter\Tests;
+
 use Joomla\Filter\Input;
+use Joomla\Filter\Output;
 
 /**
  * Test class for Filter\Input
@@ -13,7 +16,7 @@
  * @package  Joomla\Framework\Test
  * @since    1.0
  */
-class FilterInputTest extends PHPUnit_Framework_TestCase
+class FilterInputTest extends \PHPUnit_Framework_TestCase
 {
 	/**
 	 * Produces the array of test cases common to all test runs.
@@ -491,7 +494,7 @@ public function testCleanText($data, $expect)
 		$this->markTestSkipped('Why are we calling JFilterOutput in JFilterInputTest?');
 		$this->assertThat(
 			$expect,
-			$this->equalTo(JFilterOutput::cleanText($data))
+			$this->equalTo(Output::cleanText($data))
 		);
 	}
 
diff --git a/vendor/Joomla/Filter/Tests/JFilterOutputTest.php b/vendor/Joomla/Filter/Tests/OutputTest.php
similarity index 98%
rename from vendor/Joomla/Filter/Tests/JFilterOutputTest.php
rename to vendor/Joomla/Filter/Tests/OutputTest.php
index dcb7c7a23..2ea5498a8 100644
--- a/vendor/Joomla/Filter/Tests/JFilterOutputTest.php
+++ b/vendor/Joomla/Filter/Tests/OutputTest.php
@@ -5,6 +5,8 @@
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
+namespace Joomla\Filter\Tests;
+
 use Joomla\Filter\Output;
 
 /**
@@ -39,7 +41,7 @@ public function __construct()
  * @package  Joomla\Framework\Test
  * @since    1.0
  */
-class FilterOutputTest extends PHPUnit_Framework_TestCase
+class FilterOutputTest extends \PHPUnit_Framework_TestCase
 {
 	/**
 	 * @var  Output
diff --git a/vendor/Joomla/Filter/Tests/bootstrap.php b/vendor/Joomla/Filter/Tests/bootstrap.php
new file mode 100644
index 000000000..64f130a9f
--- /dev/null
+++ b/vendor/Joomla/Filter/Tests/bootstrap.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package    Joomla\Framework\Test
+ * @copyright  Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Search for the Composer autoload file
+$composerAutoload = __DIR__ . '/../../../../../autoload.php';
+
+if (file_exists($composerAutoload))
+{
+	include_once $composerAutoload;
+}
+else
+// We're not installed via composer, so load our own autoloader.
+{
+	include_once __DIR__ . '/../../../../tests/bootstrap.php';
+}
diff --git a/vendor/Joomla/Filter/phpunit.xml.dist b/vendor/Joomla/Filter/phpunit.xml.dist
new file mode 100644
index 000000000..cd4c507e6
--- /dev/null
+++ b/vendor/Joomla/Filter/phpunit.xml.dist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="Tests/bootstrap.php" colors="false">
+	<testsuites>
+		<testsuite name="Unit">
+			<directory>Tests</directory>
+		</testsuite>
+	</testsuites>
+</phpunit>