diff --git a/COPYRIGHT b/COPYRIGHT
index ba792d2a9f25b75f61a71e614efe47e0decf90d1..ae21fe54bd3457520561d3c6a02842235eb3a600 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -68,10 +68,6 @@ PackageName: py
 PackageHomePage: https://pypi.python.org/pypi/py
 PackageLicenseDeclared: MIT
 
-PackageName: pyqver
-PackageHomePage: https://github.com/ghewgill/pyqver
-PackageLicenseDeclared: BSD-3-Clause
-
 PackageName: pytest
 PackageHomePage: https://pypi.python.org/pypi/pytest
 PackageLicenseDeclared: MIT
diff --git a/lib/spack/external/_pytest/pytester.py b/lib/spack/external/_pytest/pytester.py
index 2db85dff227192d5f7c94bf2632e7c4fdab7c0a9..82aa00e0d2a368bb6d856e4b90d8e3a73eda3d1c 100644
--- a/lib/spack/external/_pytest/pytester.py
+++ b/lib/spack/external/_pytest/pytester.py
@@ -569,7 +569,7 @@ def syspathinsert(self, path=None):
     def _possibly_invalidate_import_caches(self):
         # invalidate caches if we can (py33 and above)
         try:
-            import importlib  # nopyqver
+            import importlib
         except ImportError:
             pass
         else:
diff --git a/lib/spack/external/ruamel/yaml/compat.py b/lib/spack/external/ruamel/yaml/compat.py
index 6eee151c51eb2c34c4683d38d50c18001ea5f0c8..a1778bef28c6e01d61488d1e8498acbfe30242d8 100644
--- a/lib/spack/external/ruamel/yaml/compat.py
+++ b/lib/spack/external/ruamel/yaml/compat.py
@@ -12,7 +12,7 @@
     from ruamel.ordereddict import ordereddict
 except:
     try:
-        from collections import OrderedDict  # nopyqver
+        from collections import OrderedDict
     except ImportError:
         from ordereddict import OrderedDict
     # to get the right name import ... as ordereddict doesn't do that