diff -r 9ac8df41dde7 Lib/test/test_urllib2_localnet.py
--- a/Lib/test/test_urllib2_localnet.py	Fri Jun 05 21:03:08 2015 -0500
+++ b/Lib/test/test_urllib2_localnet.py	Sat Jun 06 14:41:31 2015 +0200
@@ -304,7 +304,7 @@
     def test_basic_auth_success(self):
         ah = urllib2.HTTPBasicAuthHandler()
         ah.add_password(self.REALM, self.server_url, self.USER, self.PASSWD)
-        urllib2.install_opener(urllib2.build_opener(ah))
+        urllib2.install_opener(urllib2.build_opener(ah, urllib2.ProxyHandler({})))
         try:
             self.assertTrue(urllib2.urlopen(self.server_url))
         except urllib2.HTTPError:
@@ -316,7 +316,7 @@
         ah = urllib2.HTTPBasicAuthHandler()
         ah.add_password(self.REALM, self.server_url, self.USER,
                         self.INCORRECT_PASSWD)
-        urllib2.install_opener(urllib2.build_opener(ah))
+        urllib2.install_opener(urllib2.build_opener(ah, urllib2.ProxyHandler({})))
         self.assertRaises(urllib2.HTTPError, urllib2.urlopen, self.server_url)
 
 
@@ -329,6 +329,7 @@
 
     def setUp(self):
         super(ProxyAuthTests, self).setUp()
+        self.no_proxy = os.environ.pop('no_proxy', None)
         self.digest_auth_handler = DigestAuthHandler()
         self.digest_auth_handler.set_users({self.USER: self.PASSWD})
         self.digest_auth_handler.set_realm(self.REALM)
@@ -346,6 +347,8 @@
 
     def tearDown(self):
         self.server.stop()
+        if self.no_proxy is not None:
+            os.environ['no_proxy'] = self.no_proxy
         super(ProxyAuthTests, self).tearDown()
 
     def test_proxy_with_bad_password_raises_httperror(self):