diff --git a/tests/phpunit/includes/FormOptionsTest.php b/tests/phpunit/includes/FormOptionsTest.php
index eab2def3f4f..d14f6b0f4c9 100644
--- a/tests/phpunit/includes/FormOptionsTest.php
+++ b/tests/phpunit/includes/FormOptionsTest.php
@@ -97,154 +97,4 @@ class FormOptionsTest extends MediaWikiTestCase {
 	public function testGuessTypeOnNullThrowException() {
 		$this->object->guessType( null ); 
 	}
-
-	/**
-	 * @todo Implement testValidateName().
-	 */
-	public function testValidateName() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * @todo Implement testSetValue().
-	 */
-	public function testSetValue() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * @todo Implement testGetValue().
-	 */
-	public function testGetValue() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * @todo Implement testReset().
-	 */
-	public function testReset() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * @todo Implement testConsumeValue().
-	 */
-	public function testConsumeValue() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * @todo Implement testConsumeValues().
-	 */
-	public function testConsumeValues() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * @todo Implement testValidateIntBounds().
-	 */
-	public function testValidateIntBounds() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * @todo Implement testGetUnconsumedValues().
-	 */
-	public function testGetUnconsumedValues() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * @todo Implement testGetChangedValues().
-	 */
-	public function testGetChangedValues() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * @todo Implement testGetAllValues().
-	 */
-	public function testGetAllValues() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * @todo Implement testFetchValuesFromRequest().
-	 */
-	public function testFetchValuesFromRequest() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * @todo Implement testOffsetExists().
-	 */
-	public function testOffsetExists() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * @todo Implement testOffsetGet().
-	 */
-	public function testOffsetGet() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * @todo Implement testOffsetSet().
-	 */
-	public function testOffsetSet() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * @todo Implement testOffsetUnset().
-	 */
-	public function testOffsetUnset() {
-		// Remove the following lines when you implement this test.
-		$this->markTestIncomplete(
-		  'This test has not been implemented yet.'
-		);
-	}
 }