diff --git a/Demo/parser/test_unparse.py b/Demo/parser/test_unparse.py
index 6c060f3d255..f4a3e661136 100644
--- a/Demo/parser/test_unparse.py
+++ b/Demo/parser/test_unparse.py
@@ -156,6 +156,8 @@ class UnparseTestCase(ASTTestCase):
     def test_class_decorators(self):
         self.check_roundtrip(class_decorator)
 
+    def test_class_definition(self):
+        self.check_roundtrip("class A(metaclass=type, *[], **{}): pass")
 
 class DirectoryTestCase(ASTTestCase):
     """Test roundtrip behaviour on all files in Lib and Lib/test."""
diff --git a/Demo/parser/unparse.py b/Demo/parser/unparse.py
index 048f8ca4320..6e4ef6348e1 100644
--- a/Demo/parser/unparse.py
+++ b/Demo/parser/unparse.py
@@ -215,7 +215,7 @@ class Unparser:
         if t.kwargs:
             if comma: self.write(", ")
             else: comma = True
-            self.write("*")
+            self.write("**")
             self.dispatch(t.kwargs)
         self.write(")")