diff --git a/swiftclient/client.py b/swiftclient/client.py
index 263aaa8c..f763d97c 100644
--- a/swiftclient/client.py
+++ b/swiftclient/client.py
@@ -441,7 +441,7 @@ class HTTPConnection:
     def getresponse(self):
         """Adapt requests response to httplib interface"""
         self.resp.status = self.resp.status_code
-        old_getheader = self.resp.raw.getheader
+        old_getheader = self.resp.headers.get
 
         def _decode_header(string):
             if string is None:
diff --git a/test/unit/test_swiftclient.py b/test/unit/test_swiftclient.py
index 600b787e..5a306608 100644
--- a/test/unit/test_swiftclient.py
+++ b/test/unit/test_swiftclient.py
@@ -2003,6 +2003,7 @@ class TestHTTPConnection(MockHttpTest):
         self.assertEqual(
             '\u062a-value', resp.getheader('\u062a-UNICODE'))
         self.assertEqual('', resp.getheader('empty-header'))
+        self.assertEqual('"%s"' % EMPTY_ETAG, resp.getheader('etag'))
         self.assertEqual(
             dict([('\u062a-unicode', '\u062a-value'),
                   ('empty-header', ''),