diff --git a/.travis.yml b/.travis.yml
index 4566db0..72e3881 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-dist: xenial
 os: linux
 language: python
 env:
@@ -15,18 +14,13 @@ before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
-before_install:
-  - sudo apt-get -qq update
+addons:
+  apt:
+    packages:
+      libdbus-1-dev
 install:
-  - sudo apt-get install python-dbus
   - pip install -U coverage pytest pytest-mock freezegun
-  - pip install i3-py Pillow Babel DateTime python-dateutil
-  - pip install docker feedparser==6.0.0b1 i3ipc
-  - pip install netifaces power
-  - pip install psutil pytz
-  - pip install requests simplejson
-  - pip install suntime
-  - pip install tzlocal
+  - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
 script:
   - coverage run --source=. -m pytest tests -v
 after_script:
diff --git a/requirements/modules/battery_upower_reqs.txt b/requirements/modules/battery_upower_reqs.txt
index a7fc9f1..a8ec395 100644
--- a/requirements/modules/battery_upower_reqs.txt
+++ b/requirements/modules/battery_upower_reqs.txt
@@ -1,2 +1,2 @@
-dbus
+dbus-python
 power
diff --git a/requirements/modules/libvirtvms.txt b/requirements/modules/libvirtvms.txt
index 76aa22c..ff1a357 100644
--- a/requirements/modules/libvirtvms.txt
+++ b/requirements/modules/libvirtvms.txt
@@ -1 +1 @@
-libvirt
+libvirt-python
diff --git a/requirements/modules/spotify.txt b/requirements/modules/spotify.txt
index e2182f1..555438c 100644
--- a/requirements/modules/spotify.txt
+++ b/requirements/modules/spotify.txt
@@ -1 +1 @@
-dbus
+dbus-python
diff --git a/requirements/modules/system.txt b/requirements/modules/system.txt
index 5d6fce4..aa8980c 100644
--- a/requirements/modules/system.txt
+++ b/requirements/modules/system.txt
@@ -1 +1 @@
-tkinter
+Pillow  # placeholder for tk