diff --git a/astrowidgets/__init__.py b/astrowidgets/__init__.py
index fa544dd..30fa134 100644
--- a/astrowidgets/__init__.py
+++ b/astrowidgets/__init__.py
@@ -3,7 +3,7 @@
 # Packages may add whatever they like to this file, but
 # should keep this content at the top.
 # ----------------------------------------------------------------------------
-from ._astropy_init import *
+from ._astropy_init import *  # noqa
 # ----------------------------------------------------------------------------
 
-from .core import *
+from .core import *  # noqa
diff --git a/astrowidgets/conftest.py b/astrowidgets/conftest.py
index e786f4c..a7bd0dd 100644
--- a/astrowidgets/conftest.py
+++ b/astrowidgets/conftest.py
@@ -1,7 +1,5 @@
 # This file is used to configure the behavior of pytest when using the Astropy
 # test infrastructure.
-import os
-
 try:
     from pytest_astropy_header.display import (PYTEST_HEADER_MODULES,
                                                TESTED_VERSIONS)
@@ -11,7 +9,7 @@
 
 # Uncomment the following line to treat all DeprecationWarnings as
 # exceptions.
-# from astropy.tests.helper import enable_deprecations_as_exceptions  # noqa
+# from astropy.tests.helper import enable_deprecations_as_exceptions
 # enable_deprecations_as_exceptions()
 
 # Uncomment and customize the following lines to add/remove entries from
@@ -20,15 +18,14 @@
 # the package uses other astropy affiliated packages.
 PYTEST_HEADER_MODULES['Astropy'] = 'astropy'
 PYTEST_HEADER_MODULES['Ginga'] = 'ginga'
-PYTEST_HEADER_MODULES.pop('h5py')
-PYTEST_HEADER_MODULES.pop('Pandas')
+PYTEST_HEADER_MODULES.pop('h5py', None)
+PYTEST_HEADER_MODULES.pop('Pandas', None)
 
 # Uncomment the following lines to display the version number of the
 # package rather than the version number of Astropy in the top line when
 # running the tests.
 try:
-    from .version import version
+    from astrowidgets import __version__ as version
 except ImportError:
     version = 'unknown'
-packagename = os.path.basename(os.path.dirname(__file__))
-TESTED_VERSIONS[packagename] = version
+TESTED_VERSIONS['astrowidgets'] = version
diff --git a/conftest.py b/conftest.py
new file mode 100644
index 0000000..a7bd0dd
--- /dev/null
+++ b/conftest.py
@@ -0,0 +1,31 @@
+# This file is used to configure the behavior of pytest when using the Astropy
+# test infrastructure.
+try:
+    from pytest_astropy_header.display import (PYTEST_HEADER_MODULES,
+                                               TESTED_VERSIONS)
+except ImportError:
+    PYTEST_HEADER_MODULES = {}
+    TESTED_VERSIONS = {}
+
+# Uncomment the following line to treat all DeprecationWarnings as
+# exceptions.
+# from astropy.tests.helper import enable_deprecations_as_exceptions
+# enable_deprecations_as_exceptions()
+
+# Uncomment and customize the following lines to add/remove entries from
+# the list of packages for which version numbers are displayed when running
+# the tests. Making it pass for KeyError is essential in some cases when
+# the package uses other astropy affiliated packages.
+PYTEST_HEADER_MODULES['Astropy'] = 'astropy'
+PYTEST_HEADER_MODULES['Ginga'] = 'ginga'
+PYTEST_HEADER_MODULES.pop('h5py', None)
+PYTEST_HEADER_MODULES.pop('Pandas', None)
+
+# Uncomment the following lines to display the version number of the
+# package rather than the version number of Astropy in the top line when
+# running the tests.
+try:
+    from astrowidgets import __version__ as version
+except ImportError:
+    version = 'unknown'
+TESTED_VERSIONS['astrowidgets'] = version
diff --git a/setup.cfg b/setup.cfg
index 32c2c5c..89f0a8d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,7 +11,6 @@ addopts = -p no:warnings
 # E501: line too long
 # W503: line break before binary operator
 ignore = E501,W503
-exclude = setup_package.py,conftest.py,__init__.py
 
 [metadata]
 name = astrowidgets