Index: tests/phpunit/includes/bootstrap.php
===================================================================
--- tests/phpunit/includes/bootstrap.php	(revision 34121)
+++ tests/phpunit/includes/bootstrap.php	(working copy)
@@ -38,6 +38,7 @@
 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 $_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;
 $_SERVER['REQUEST_METHOD'] = 'GET';
+$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
 $PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
 
 if ( "1" == getenv( 'WP_MULTISITE' ) ||
Index: tests/phpunit/tests/ajax/ReplytoComment.php
===================================================================
--- tests/phpunit/tests/ajax/ReplytoComment.php	(revision 34121)
+++ tests/phpunit/tests/ajax/ReplytoComment.php	(working copy)
@@ -38,8 +38,6 @@
 
 		$post_id = $this->factory->post->create( array( 'post_status' => 'draft' ) );
 		$this->_draft_post = get_post( $post_id );
-
-		$_SERVER['REMOTE_ADDR'] = '';
 	}
 
 	public function tearDown() {
Index: tests/phpunit/tests/ajax/ReplytoComment.php
===================================================================
--- tests/phpunit/tests/ajax/ReplytoComment.php	(revision 34121)
+++ tests/phpunit/tests/ajax/ReplytoComment.php	(working copy)
@@ -38,8 +38,6 @@
 
 		$post_id = $this->factory->post->create( array( 'post_status' => 'draft' ) );
 		$this->_draft_post = get_post( $post_id );
-
-		$_SERVER['REMOTE_ADDR'] = '';
 	}
 
 	public function tearDown() {
Index: tests/phpunit/tests/comment.php
===================================================================
--- tests/phpunit/tests/comment.php	(revision 34121)
+++ tests/phpunit/tests/comment.php	(working copy)
@@ -77,13 +77,6 @@
 	 * @ticket 14279
 	 */
 	public function test_wp_new_comment_respects_dates() {
-		// `wp_new_comment()` checks REMOTE_ADDR, so we fake it to avoid PHP notices.
-		if ( isset( $_SERVER['REMOTE_ADDR'] ) ) {
-			$remote_addr = $_SERVER['REMOTE_ADDR'];
-		} else {
-			$_SERVER['REMOTE_ADDR'] = '';
-		}
-
 		$u = $this->factory->user->create();
 		$post_id = $this->factory->post->create( array( 'post_author' => $u ) );
 
@@ -104,13 +97,6 @@
 
 		$this->assertEquals( $data['comment_date'], $comment->comment_date );
 		$this->assertEquals( $data['comment_date_gmt'], $comment->comment_date_gmt );
-
-		// Cleanup.
-		if ( isset( $remote_addr ) ) {
-			$_SERVER['REMOTE_ADDR'] = $remote_addr;
-		} else {
-			unset( $_SERVER['REMOTE_ADDR'] );
-		}
 	}
 
 	/**
@@ -238,13 +224,6 @@
 
 
 	public function test_comment_field_lengths() {
-		// `wp_new_comment()` checks REMOTE_ADDR, so we fake it to avoid PHP notices.
-		if ( isset( $_SERVER['REMOTE_ADDR'] ) ) {
-			$remote_addr = $_SERVER['REMOTE_ADDR'];
-		} else {
-			$_SERVER['REMOTE_ADDR'] = '';
-		}
-
 		$u = $this->factory->user->create();
 		$post_id = $this->factory->post->create( array( 'post_author' => $u ) );
 
@@ -264,13 +243,6 @@
 		$comment = get_comment( $id );
 
 		$this->assertEquals( strlen( $comment->comment_content ), 65535 );
-
-		// Cleanup.
-		if ( isset( $remote_addr ) ) {
-			$_SERVER['REMOTE_ADDR'] = $remote_addr;
-		} else {
-			unset( $_SERVER['REMOTE_ADDR'] );
-		}
 	}
 
 	/**
Index: tests/phpunit/tests/multisite/bootstrap.php
===================================================================
--- tests/phpunit/tests/multisite/bootstrap.php	(revision 34121)
+++ tests/phpunit/tests/multisite/bootstrap.php	(working copy)
@@ -15,8 +15,6 @@
 		global $wpdb;
 		parent::setUp();
 		$this->suppress = $wpdb->suppress_errors();
-
-		$_SERVER[ 'REMOTE_ADDR' ] = '';
 	}
 
 	function tearDown() {
Index: tests/phpunit/tests/multisite/bootstrap.php
===================================================================
--- tests/phpunit/tests/multisite/bootstrap.php	(revision 34121)
+++ tests/phpunit/tests/multisite/bootstrap.php	(working copy)
@@ -15,8 +15,6 @@
 		global $wpdb;
 		parent::setUp();
 		$this->suppress = $wpdb->suppress_errors();
-
-		$_SERVER[ 'REMOTE_ADDR' ] = '';
 	}
 
 	function tearDown() {
Index: tests/phpunit/tests/multisite/ms-files-rewriting.php
===================================================================
--- tests/phpunit/tests/multisite/ms-files-rewriting.php	(revision 34121)
+++ tests/phpunit/tests/multisite/ms-files-rewriting.php	(working copy)
@@ -19,8 +19,6 @@
 		parent::setUp();
 		$this->suppress = $wpdb->suppress_errors();
 
-		$_SERVER[ 'REMOTE_ADDR' ] = '';
-
 		update_site_option( 'ms_files_rewriting', 1 );
 		ms_upload_constants();
 	}
Index: tests/phpunit/tests/multisite/ms-files-rewriting.php
===================================================================
--- tests/phpunit/tests/multisite/ms-files-rewriting.php	(revision 34121)
+++ tests/phpunit/tests/multisite/ms-files-rewriting.php	(working copy)
@@ -19,8 +19,6 @@
 		parent::setUp();
 		$this->suppress = $wpdb->suppress_errors();
 
-		$_SERVER[ 'REMOTE_ADDR' ] = '';
-
 		update_site_option( 'ms_files_rewriting', 1 );
 		ms_upload_constants();
 	}
Index: tests/phpunit/tests/multisite/network.php
===================================================================
--- tests/phpunit/tests/multisite/network.php	(revision 34121)
+++ tests/phpunit/tests/multisite/network.php	(working copy)
@@ -16,8 +16,6 @@
 		global $wpdb;
 		parent::setUp();
 		$this->suppress = $wpdb->suppress_errors();
-
-		$_SERVER[ 'REMOTE_ADDR' ] = '';
 	}
 
 	function tearDown() {
Index: tests/phpunit/tests/multisite.php
===================================================================
--- tests/phpunit/tests/multisite.php	(revision 34121)
+++ tests/phpunit/tests/multisite.php	(working copy)
@@ -14,8 +14,6 @@
 		global $wpdb;
 		parent::setUp();
 		$this->suppress = $wpdb->suppress_errors();
-
-		$_SERVER['REMOTE_ADDR'] = '';
 	}
 
 	function tearDown() {
Index: tests/phpunit/tests/option/multisite.php
===================================================================
--- tests/phpunit/tests/option/multisite.php	(revision 34121)
+++ tests/phpunit/tests/option/multisite.php	(working copy)
@@ -16,8 +16,6 @@
 		global $wpdb;
 		parent::setUp();
 		$this->suppress = $wpdb->suppress_errors();
-
-		$_SERVER['REMOTE_ADDR'] = null;
 	}
 
 	function tearDown() {
Index: tests/phpunit/tests/user/multisite.php
===================================================================
--- tests/phpunit/tests/user/multisite.php	(revision 34121)
+++ tests/phpunit/tests/user/multisite.php	(working copy)
@@ -16,8 +16,6 @@
 		global $wpdb;
 		parent::setUp();
 		$this->suppress = $wpdb->suppress_errors();
-
-		$_SERVER[ 'REMOTE_ADDR' ] = '';
 	}
 
 	function tearDown() {