diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 7e83739081..7d1253f12d 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-15  Christian Groessler  <chris@groessler.org>
+
+	* gas/z8k/eidi.s: Add uppercase forms.  Add forms with comma
+	separated parameters.
+
 2003-12-14  Mark Mitchell  <mark@codesourcery.com>
 
 	* gas/arm/thumbv6.s: Add nops.
diff --git a/gas/testsuite/gas/z8k/eidi.s b/gas/testsuite/gas/z8k/eidi.s
index 3859792d08..f645aedbf6 100644
--- a/gas/testsuite/gas/z8k/eidi.s
+++ b/gas/testsuite/gas/z8k/eidi.s
@@ -1,4 +1,5 @@
 .text
+
 	ei	all
 	di	all
 	ei	both
@@ -8,3 +9,22 @@
 	ei	nvi
 	di	nvi
 
+	ei	vi,nvi
+	ei	nvi,vi
+	di	vi,nvi
+	di	nvi,vi
+
+
+	EI	ALL
+	DI	ALL
+	EI	BOTH
+	DI	BOTH
+	EI	VI
+	DI	VI
+	EI	NVI
+	DI	NVI
+
+	EI	VI,NVI
+	EI	NVI,VI
+	DI	VI,NVI
+	DI	NVI,VI