--- a/genshi/template/tests/directives.py
+++ b/genshi/template/tests/directives.py
@@ -30,9 +30,9 @@
         tmpl = MarkupTemplate("""<doc xmlns:py="http://genshi.edgewall.org/">
           <elem py:for="item in items" py:attrs="item"/>
         </doc>""")
-        items = [{'id': 1, 'class': 'foo'}, {'id': 2, 'class': 'bar'}]
+        items = [{'id': 1}, {'id': 2}]
         self.assertEqual("""<doc>
-          <elem id="1" class="foo"/><elem id="2" class="bar"/>
+          <elem id="1"/><elem id="2"/>
         </doc>""", tmpl.generate(items=items).render(encoding=None))
 
     def test_update_existing_attr(self):
@@ -395,14 +395,14 @@
         tmpl = MarkupTemplate("""<doc xmlns:py="http://genshi.edgewall.org/">
           <div py:def="f(*args, **kwargs)">
             ${repr(args)}
-            ${repr(kwargs)}
+            ${repr(sorted(kwargs.items()))}
           </div>
           ${f(1, 2, a=3, b=4)}
         </doc>""")
         self.assertEqual("""<doc>
           <div>
             [1, 2]
-            {'a': 3, 'b': 4}
+            [('a', 3), ('b', 4)]
           </div>
         </doc>""", tmpl.generate().render(encoding=None))
 
@@ -457,7 +457,7 @@
         self.assertEqual("""<doc>
             <p>key=a, value=1</p>
             <p>key=b, value=2</p>
-        </doc>""", tmpl.generate(items=dict(a=1, b=2).items())
+        </doc>""", tmpl.generate(items=(('a', 1), ('b', 2)))
                        .render(encoding=None))
 
     def test_nested_assignment(self):
@@ -472,7 +472,7 @@
         self.assertEqual("""<doc>
             <p>0: key=a, value=1</p>
             <p>1: key=b, value=2</p>
-        </doc>""", tmpl.generate(items=enumerate(dict(a=1, b=2).items()))
+        </doc>""", tmpl.generate(items=enumerate([('a', 1), ('b', 2)]))
                        .render(encoding=None))
 
     def test_not_iterable(self):