diff --git a/diceware/__init__.py b/diceware/__init__.py
index 8a87c7a2185719c8ddc2216816604e834b22e8a4..bec78deeab14ef294efff2dcd83f42f24e5855c2 100644
--- a/diceware/__init__.py
+++ b/diceware/__init__.py
@@ -132,9 +132,9 @@ def get_wordlist_names():
     for filename in filenames:
         if not os.path.isfile(os.path.join(WORDLISTS_DIR, filename)):
             continue
-        if not "_" in filename:
+        if "_" not in filename:
             continue
-        if not "." in filename:
+        if "." not in filename:
             continue
         basename = filename.split(".")[0]
         name = basename.split("_", 1)[1]
diff --git a/tests/test_diceware.py b/tests/test_diceware.py
index 6c19b26d9542ac5bb074207c13739dca4b69845c..95e3e4d1f59de64e335ee87cb1c7b85b5ed00137 100644
--- a/tests/test_diceware.py
+++ b/tests/test_diceware.py
@@ -40,7 +40,6 @@ def argv_handler(request):
 def wordlists_dir(request, monkeypatch, tmpdir):
     """This fixture provides a temporary wordlist dir.
     """
-    _orig_wordlists_dir = WORDLISTS_DIR
     monkeypatch.setattr("diceware.WORDLISTS_DIR", str(tmpdir))
     return tmpdir