diff --git a/tests/data/emitting-unacceptable-unicode-character-bug-ucs4-py2.code b/emitting-unacceptable-unicode-character-bug.code
similarity index 100%
rename from tests/data/emitting-unacceptable-unicode-character-bug-ucs4-py2.code
rename to emitting-unacceptable-unicode-character-bug.code
diff --git a/tests/data/emitting-unacceptable-unicode-character-bug-ucs4-py2.data b/emitting-unacceptable-unicode-character-bug.data
similarity index 100%
rename from tests/data/emitting-unacceptable-unicode-character-bug-ucs4-py2.data
rename to emitting-unacceptable-unicode-character-bug.data
diff --git a/tests/data/emitting-unacceptable-unicode-character-bug-ucs4-py2.skip-ext b/emitting-unacceptable-unicode-character-bug.skip-ext
similarity index 100%
rename from tests/data/emitting-unacceptable-unicode-character-bug-ucs4-py2.skip-ext
rename to emitting-unacceptable-unicode-character-bug.skip-ext
diff --git a/tests/data/emoticons-ucs4-.unicode b/tests/data/emoticons.unicode
similarity index 100%
rename from tests/data/emoticons-ucs4-.unicode
rename to tests/data/emoticons.unicode
diff --git a/tests/data/emoticons2-ucs4-.unicode b/tests/data/emoticons2.unicode
similarity index 100%
rename from tests/data/emoticons2-ucs4-.unicode
rename to tests/data/emoticons2.unicode