diff --git a/tests/test_diceware.py b/tests/test_diceware.py
index af7e7d63c87fd3c4fa2ac2853167054d98cd7db9..f7aa0d0d43a633d5ca1cb102cf799f7d52b93155 100644
--- a/tests/test_diceware.py
+++ b/tests/test_diceware.py
@@ -83,10 +83,11 @@ class TestDicewareModule(object):
         assert RE_WORDLIST_NAME.match('original') is not None
         assert RE_WORDLIST_NAME.match('with_underscore') is not None
         assert RE_WORDLIST_NAME.match('u') is not None
+        assert RE_WORDLIST_NAME.match('with-hyphen') is not None
         # invalid stuff
         assert RE_WORDLIST_NAME.match('with space') is None
-        assert RE_WORDLIST_NAME.match('"with quotation marks"') is None
-        assert RE_WORDLIST_NAME.match("'with quotation marks'") is None
+        assert RE_WORDLIST_NAME.match('"with-quotation-marks"') is None
+        assert RE_WORDLIST_NAME.match("'with-quotation-marks'") is None
         assert RE_WORDLIST_NAME.match('with.dot') is None
         assert RE_WORDLIST_NAME.match('with/slash') is None