diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py
index 9d9a78bb1..60e9e8239 100644
--- a/ipatests/test_integration/tasks.py
+++ b/ipatests/test_integration/tasks.py
@@ -946,7 +946,7 @@ def double_circle_topo(master, replicas, site_size=6):
 
     # split servers into sites
     it = [iter(servers)] * site_size
-    sites = map(lambda x: (x[0], x[1], x[2:]), zip(*it))
+    sites = [(x[0], x[1], x[2:]) for x in zip(*it)]
     num_sites = len(sites)
 
     for i in range(num_sites):
diff --git a/ipatests/test_integration/test_topologies.py b/ipatests/test_integration/test_topologies.py
index a0a1b9d62..4618b44fe 100644
--- a/ipatests/test_integration/test_topologies.py
+++ b/ipatests/test_integration/test_topologies.py
@@ -121,7 +121,7 @@ def test_topology_two_connected():
 def test_topology_double_circle_topo():
     topo = tasks.get_topo('double-circle')
     assert topo == tasks.double_circle_topo
-    assert list(topo('M', range(1, 30))) == [
+    assert list(topo('M', list(range(1, 30)))) == [
         ('M', 1),
         (1, 6),
         (1, 12),