diff --git a/test/scripts/breakpoint.py b/test/scripts/breakpoint.py
index 4939210..058bd81 100644
--- a/test/scripts/breakpoint.py
+++ b/test/scripts/breakpoint.py
@@ -147,7 +147,8 @@ class BreakpointTest( unittest.TestCase ):
         self.assertEqual(3, pykd.getNumberBreakpoints());
         bpLst = [pykd.getBp(i) for i in range(3)]
         self.assertEqual(3, len(bpLst))
-        map( lambda bp: bp.remove(), bpLst)
+        for bp in bpLst: bp.remove()
+
         self.assertEqual(0, pykd.getNumberBreakpoints());
 
     def testBreakpointChangeHandler(self):
diff --git a/test/scripts/typedvar.py b/test/scripts/typedvar.py
index 4a0d8b0..1dc0d60 100644
--- a/test/scripts/typedvar.py
+++ b/test/scripts/typedvar.py
@@ -145,15 +145,15 @@ class TypedVarTest( unittest.TestCase ):
     def testTypedVarList(self):
         tvl = target.module.typedVarList( target.module.g_listHead, "listStruct", "next.flink" )
         self.assertEqual( 5, len( tvl ) )
-        self.assertEqual( range(5), [ tv.num for tv in tvl ] )
+        self.assertEqual( [ i for i in range(5)], [ tv.num for tv in tvl ] )
 
         tvl = pykd.typedVarList( target.module.g_listHead, target.module.type("listStruct"), "next.flink" )
         self.assertEqual( 5, len( tvl ) )
-        self.assertEqual( range(5), [ tv.num for tv in tvl ] )
+        self.assertEqual( [ i for i in range(5)], [ tv.num for tv in tvl ] )
 
         tvl = pykd.typedVarList( target.module.g_listHead, target.module.type("listStruct"), "next.flink" )
         self.assertEqual( 5, len( tvl ) )
-        self.assertEqual( range(5), [ tv.num for tv in tvl ] )
+        self.assertEqual( [ i for i in range(5)], [ tv.num for tv in tvl ] )
 
         #tvl = target.module.typedVarList( target.module.g_listHead1, "listStruct1", "next" )
         #self.assertEqual( 3, len( tvl ) )
@@ -361,7 +361,7 @@ class TypedVarTest( unittest.TestCase ):
         self.assertTrue( 10001999 < target.module.typedVar( "ulongVar" ) )
         self.assertTrue( 10002001 >= target.module.typedVar( "ulongVar" ) )
         self.assertTrue( 10001999 <= target.module.typedVar( "ulongVar" ) )
-        self.assertTrue( True if target.module.typedVar( "ulongVar" ) else False )
+        self.assertTrue( True if target.module.typedVar( "ulongVar" )  else False )
         self.assertTrue( False if not target.module.typedVar( "ulongVar" ) else True )