diff --git a/heatclient/tests/test_shell.py b/heatclient/tests/test_shell.py
index 80257c4a..5bc2a6ea 100644
--- a/heatclient/tests/test_shell.py
+++ b/heatclient/tests/test_shell.py
@@ -392,9 +392,11 @@ class ShellTestUserPass(ShellBase):
 
     def test_stack_list_with_args(self):
         self._script_keystone_client()
-        expected_url = ('/stacks?'
-                        'status=COMPLETE&status=FAILED'
-                        '&marker=fake_id&limit=2')
+        expected_url = '/stacks?%s' % urlutils.urlencode({
+            'limit': 2,
+            'status': ['COMPLETE', 'FAILED'],
+            'marker': 'fake_id',
+        }, True)
         fakes.script_heat_list(expected_url)
 
         self.m.ReplayAll()
diff --git a/tox.ini b/tox.ini
index 98100ae8..ced6c9ec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,10 @@ minversion = 1.6
 skipsdist = True
 
 [testenv]
+# Set PYTHONHASHSEED to 0 so that randomisation is disabled and
+# urlutils.urlencode() has predictable results.
 setenv = VIRTUAL_ENV={envdir}
+        PYTHONHASHSEED=0
 usedevelop = True
 install_command = pip install -U {opts} {packages}
 deps = -r{toxinidir}/requirements.txt