diff --git a/webagg/responseloader.py b/webagg/responseloader.py
index 576b14d6..7da983cb 100644
--- a/webagg/responseloader.py
+++ b/webagg/responseloader.py
@@ -18,7 +18,8 @@ from six.moves.urllib.parse import urlsplit
 import uuid
 import six
 import itertools
-#import requests
+
+from requests.models import PreparedRequest
 import urllib3
 
 
@@ -241,6 +242,10 @@ class LiveWebLoader(BaseLoader):
         method = input_req.get_req_method()
         data = input_req.get_req_body()
 
+        p = PreparedRequest()
+        p.prepare_url(load_url, None)
+        load_url = p.url
+
         try:
             upstream_res = self.pool.urlopen(method=method,
                                              url=load_url,
diff --git a/webagg/test/live.py b/webagg/test/live.py
index b6c10a22..2e4f84a9 100644
--- a/webagg/test/live.py
+++ b/webagg/test/live.py
@@ -27,7 +27,7 @@ def simpleapp():
                                 './testdata/'
         )
     )
-    return app.application
+    return app
 
 
 
diff --git a/webagg/test/test_memento_agg.py b/webagg/test/test_memento_agg.py
index 2255b951..73bd0409 100644
--- a/webagg/test/test_memento_agg.py
+++ b/webagg/test/test_memento_agg.py
@@ -63,7 +63,7 @@ def test_mem_agg_index_2(agg):
             {"timestamp": "20100511201151", "load_url": "http://wayback.archive-it.org/all/20100511201151id_/http://example.com/", "source": "ait"},
             {"timestamp": "20100514231857", "load_url": "http://web.archive.org/web/20100514231857id_/http://example.com/", "source": "ia"},
             {"timestamp": "20100514231857", "load_url": "http://wayback.archive-it.org/all/20100514231857id_/http://example.com/", "source": "ait"},
-            {"timestamp": "20100519202418", "load_url": "http://web.archive.org/web/20100519202418id_/http://example.com/", "source": "ia"}]
+            {"timestamp": "20100510233601", "load_url": "http://web.archive.org/web/20100510233601id_/http://example.com/", "source": "ia"}]
 
     assert(to_json_list(res) == exp)
     assert(errs == {'rhiz': "NotFoundException('http://webenact.rhizome.org/vvork/http://example.com/',)"})