diff --git a/test/functional/test_tempurl.py b/test/functional/test_tempurl.py
index eb3c22d6f7..2e4be9021a 100644
--- a/test/functional/test_tempurl.py
+++ b/test/functional/test_tempurl.py
@@ -588,9 +588,12 @@ class TestContainerTempurl(Base):
         if not tf.cluster_info.get('tempauth'):
             raise SkipTest('TEMP AUTH SPECIFIC TEST')
         original_token = self.env.container.conn.storage_token
-        self.env.container.conn.storage_token = self.env.conn2.storage_token
-        metadata = self.env.container.info()
-        self.env.container.conn.storage_token = original_token
+        try:
+            self.env.container.conn.storage_token = \
+                self.env.conn2.storage_token
+            metadata = self.env.container.info()
+        finally:
+            self.env.container.conn.storage_token = original_token
 
         self.assertNotIn(
             'tempurl_key', metadata,