diff --git a/setup.cfg b/setup.cfg
index 081fab6..d417aa6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,8 +31,8 @@ keywords = bumblebee-status
 
 [options]
 include_package_data = True
-allow-all-external = yes
-trusted-host =
+allow_all_external = yes
+trusted_host =
     gitlab.*
     bitbucket.org
     github.com
diff --git a/setup.py b/setup.py
index 2e5bafb..1f6c203 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Setup file for bumbleestatus bar to allow pip install of full package"""
 # -*- coding: utf8 - *-
-from setuptools import setup
+from setuptools import setup, find_packages
 import versioneer
 
 with open("requirements/base.txt") as f:
@@ -57,4 +57,5 @@ setup(
         ("share/bumblebee-status/themes/icons", glob.glob("themes/icons/*.json")),
         ("share/bumblebee-status/utility", glob.glob("bin/*")),
     ],
+    packages=find_packages(exclude=["tests", "tests.*"])
 )