diff --git a/tests/unit/core/case/case.php b/tests/unit/core/case/case.php
index 270a79675ca59..4b266c9ae08d2 100644
--- a/tests/unit/core/case/case.php
+++ b/tests/unit/core/case/case.php
@@ -371,7 +371,7 @@ public function setExpectedError($error = null)
 	 */
 	protected function restoreErrorHandlers()
 	{
-		$this->setErrorhandlers($this->_stashedErrorState);
+		$this->setErrorHandlers($this->_stashedErrorState);
 	}
 
 	/**
diff --git a/tests/unit/stubs/discover1/challenger.php b/tests/unit/stubs/discover1/challenger.php
index cd8065a10bf00..37acc3f82e162 100644
--- a/tests/unit/stubs/discover1/challenger.php
+++ b/tests/unit/stubs/discover1/challenger.php
@@ -1 +1 @@
-<?php /* @codingStandardsIgnoreFile Empty file */ ?>
+<?php /* @codingStandardsIgnoreFile Empty file */
diff --git a/tests/unit/stubs/discover1/columbia.php b/tests/unit/stubs/discover1/columbia.php
index cd8065a10bf00..37acc3f82e162 100644
--- a/tests/unit/stubs/discover1/columbia.php
+++ b/tests/unit/stubs/discover1/columbia.php
@@ -1 +1 @@
-<?php /* @codingStandardsIgnoreFile Empty file */ ?>
+<?php /* @codingStandardsIgnoreFile Empty file */
diff --git a/tests/unit/suites/libraries/joomla/controller/JControllerBaseTest.php b/tests/unit/suites/libraries/joomla/controller/JControllerBaseTest.php
index 2bc1b245a0360..0fe78a1796e21 100644
--- a/tests/unit/suites/libraries/joomla/controller/JControllerBaseTest.php
+++ b/tests/unit/suites/libraries/joomla/controller/JControllerBaseTest.php
@@ -172,6 +172,6 @@ protected function tearDown()
 	{
 		$this->restoreFactoryState();
 		unset($this->_instance);
-		parent::teardown();
+		parent::tearDown();
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/feed/JFeedEntryTest.php b/tests/unit/suites/libraries/joomla/feed/JFeedEntryTest.php
index 0033c9fcd9536..25728cb7b66f3 100644
--- a/tests/unit/suites/libraries/joomla/feed/JFeedEntryTest.php
+++ b/tests/unit/suites/libraries/joomla/feed/JFeedEntryTest.php
@@ -352,6 +352,6 @@ protected function tearDown()
 	{
 		unset($this->_instance);
 
-		parent::teardown();
+		parent::tearDown();
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/feed/JFeedParserTest.php b/tests/unit/suites/libraries/joomla/feed/JFeedParserTest.php
index f83fd2d76dd9f..9978532645e00 100644
--- a/tests/unit/suites/libraries/joomla/feed/JFeedParserTest.php
+++ b/tests/unit/suites/libraries/joomla/feed/JFeedParserTest.php
@@ -55,7 +55,7 @@ public function testParse()
 
 		// Set the XML for the internal reader and move the stream to the <root> element.
 		$xml = '<root xmlns="http://bar.foo" xmlns:namespace="http://foo.bar"><tag1>foobar</tag1><namespace:tag2 attr="value" /></root>';
-		$this->_reader->Xml($xml);
+		$this->_reader->XML($xml);
 
 		// Advance the reader to the first <tag1> element.
 		do
@@ -207,7 +207,7 @@ public function testFetchNamespace()
 	public function testMoveToNextElement()
 	{
 		// Set the XML for the internal reader and move the stream to the <root> element.
-		$this->_reader->Xml('<root><node test="first"><child>foobar</child></node><node test="second"></node></root>');
+		$this->_reader->XML('<root><node test="first"><child>foobar</child></node><node test="second"></node></root>');
 		$this->_reader->next('root');
 
 		// Ensure that the current node is "root".
@@ -243,7 +243,7 @@ public function testMoveToNextElement()
 	public function testMoveToNextElementByName()
 	{
 		// Set the XML for the internal reader and move the stream to the <root> element.
-		$this->_reader->Xml('<root><node test="first"><child>foobar</child></node><node test="second"></node></root>');
+		$this->_reader->XML('<root><node test="first"><child>foobar</child></node><node test="second"></node></root>');
 
 		// Move to the next <node> element, which should be <node test="first">.
 		TestReflection::invoke($this->_instance, 'moveToNextElement', 'node');
@@ -266,7 +266,7 @@ public function testMoveToNextElementByName()
 	public function testMoveToClosingElement()
 	{
 		// Set the XML for the internal reader and move the stream to the <root> element.
-		$this->_reader->Xml('<root><child>foobar</child></root>');
+		$this->_reader->XML('<root><child>foobar</child></root>');
 		$this->_reader->next('root');
 
 		// Ensure that the current node is "root".
@@ -288,7 +288,7 @@ public function testMoveToClosingElement()
 	public function testMoveToClosingElementWithInternalElements()
 	{
 		// Set the XML for the internal reader and move the stream to the first <node> element.
-		$this->_reader->Xml('<root><node test="first"><child>foobar</child></node><node test="second"></node></root>');
+		$this->_reader->XML('<root><node test="first"><child>foobar</child></node><node test="second"></node></root>');
 
 		// Advance the reader to the first <node> element.
 		do
@@ -335,7 +335,7 @@ public function testMoveToClosingElementWithInternalElements()
 	public function testMoveToClosingElementWithSelfClosingTag()
 	{
 		// Set the XML for the internal reader and move the stream to the first <node> element.
-		$this->_reader->Xml('<root><node test="first" /><node test="second"></node></root>');
+		$this->_reader->XML('<root><node test="first" /><node test="second"></node></root>');
 
 		// Advance the reader to the first <node> element.
 		do
@@ -399,6 +399,6 @@ protected function tearDown()
 		unset($this->_instance);
 		unset($this->_reader);
 
-		parent::teardown();
+		parent::tearDown();
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/feed/JFeedTest.php b/tests/unit/suites/libraries/joomla/feed/JFeedTest.php
index f468170ae2f96..a1c1495e6f816 100644
--- a/tests/unit/suites/libraries/joomla/feed/JFeedTest.php
+++ b/tests/unit/suites/libraries/joomla/feed/JFeedTest.php
@@ -450,6 +450,6 @@ protected function tearDown()
 	{
 		unset($this->_instance);
 
-		parent::teardown();
+		parent::tearDown();
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserAtomTest.php b/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserAtomTest.php
index 2a2645fafd287..48638040e6ff0 100644
--- a/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserAtomTest.php
+++ b/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserAtomTest.php
@@ -247,7 +247,7 @@ public function testHandleUpdated()
 	public function testInitialise($expected, $xml)
 	{
 		// Set the XML for the internal reader.
-		$this->_reader->Xml($xml);
+		$this->_reader->XML($xml);
 
 		// Advance the reader to the first element.
 		do
@@ -329,6 +329,6 @@ protected function tearDown()
 		unset($this->_instance);
 		unset($this->_reader);
 
-		parent::teardown();
+		parent::tearDown();
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserRssTest.php b/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserRssTest.php
index 94d662fb96bab..6f7c880856f39 100644
--- a/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserRssTest.php
+++ b/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserRssTest.php
@@ -453,7 +453,7 @@ public function testHandleWebmaster()
 	public function testInitialise($expected, $xml)
 	{
 		// Set the XML for the internal reader.
-		$this->_reader->Xml($xml);
+		$this->_reader->XML($xml);
 
 		// Advance the reader to the first element.
 		do
@@ -576,6 +576,6 @@ protected function tearDown()
 		unset($this->_instance);
 		unset($this->_reader);
 
-		parent::teardown();
+		parent::tearDown();
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/form/JFormTest.php b/tests/unit/suites/libraries/joomla/form/JFormTest.php
index 14be009c97278..5bf3b245da753 100644
--- a/tests/unit/suites/libraries/joomla/form/JFormTest.php
+++ b/tests/unit/suites/libraries/joomla/form/JFormTest.php
@@ -78,8 +78,8 @@ private function _showXml($form)
 		$dom = new DOMDocument('1.0');
 		$dom->preserveWhiteSpace = false;
 		$dom->formatOutput = true;
-		$dom->loadXml($form->getXml()->asXml());
-		echo $dom->saveXml();
+		$dom->loadXML($form->getXml()->asXml());
+		echo $dom->saveXML();
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/joomla/google/JGoogleDataAdsenseTest.php b/tests/unit/suites/libraries/joomla/google/JGoogleDataAdsenseTest.php
index ac9aca8a2af9b..7017935b3ca68 100644
--- a/tests/unit/suites/libraries/joomla/google/JGoogleDataAdsenseTest.php
+++ b/tests/unit/suites/libraries/joomla/google/JGoogleDataAdsenseTest.php
@@ -261,7 +261,7 @@ public function testGenerateReport()
 		$timezone = new DateTimeZone('Europe/London');
 		$start = new DateTime('now');
 		$end = new DateTime;
-		$end->setTimestamp(time() + 3600)->setTimeZone($timezone);
+		$end->setTimestamp(time() + 3600)->setTimezone($timezone);
 
 		$result = $this->object->generateReport('accountID', time(), time() + 100000, array('option' => 'value'));
 		$this->assertEquals($result, array('rows' => array(1, 2), 'totalMatchedRows' => 1));
diff --git a/tests/unit/suites/libraries/joomla/google/JGoogleDataCalendarTest.php b/tests/unit/suites/libraries/joomla/google/JGoogleDataCalendarTest.php
index 41cc4779a16e9..8bffa9e12ccb7 100644
--- a/tests/unit/suites/libraries/joomla/google/JGoogleDataCalendarTest.php
+++ b/tests/unit/suites/libraries/joomla/google/JGoogleDataCalendarTest.php
@@ -287,7 +287,7 @@ public function testCreateEvent()
 		$timezone = new DateTimeZone('Europe/London');
 		$start = new DateTime('now');
 		$end = new DateTime;
-		$end->setTimestamp(time() + 3600)->setTimeZone($timezone);
+		$end->setTimestamp(time() + 3600)->setTimezone($timezone);
 
 		$result = $this->object->createEvent('calendarID', time(), time() + 100000, array('option' => 'value'));
 		$this->assertEquals($result, array('items' => array('1' => 1, '2' => 2)));
diff --git a/tests/unit/suites/libraries/joomla/model/JModelDatabaseTest.php b/tests/unit/suites/libraries/joomla/model/JModelDatabaseTest.php
index 26d69c98189bf..b52ed9ae8bec5 100644
--- a/tests/unit/suites/libraries/joomla/model/JModelDatabaseTest.php
+++ b/tests/unit/suites/libraries/joomla/model/JModelDatabaseTest.php
@@ -123,6 +123,6 @@ protected function tearDown()
 	{
 		$this->restoreFactoryState();
 		unset($this->_instance);
-		parent::teardown();
+		parent::tearDown();
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/table/JTableNestedTest.php b/tests/unit/suites/libraries/joomla/table/JTableNestedTest.php
index f37bd3e94e6e9..0258ed457ffb8 100644
--- a/tests/unit/suites/libraries/joomla/table/JTableNestedTest.php
+++ b/tests/unit/suites/libraries/joomla/table/JTableNestedTest.php
@@ -785,7 +785,7 @@ protected function getDataSet()
 	 */
 	protected function setUp()
 	{
-		parent::setup();
+		parent::setUp();
 
 // 		$this->saveFactoryState();