diff --git a/.travis.yml b/.travis.yml
index 45e0434..5d2764f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,15 @@
-language: cpp
+language: generic
 os:
 - osx
+- linux
 osx_image: xcode7.3
 sudo: required
 install:
 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then bash package/prepare_osx.sh; fi
+- if [ "$TRAVIS_OS_NAME" = "linux" ]; then bash package/prepare_linux.sh; fi
 script:
-- python3 package/dependency_test.py
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then python3 -m pytest -vs; fi
+- if [ "$TRAVIS_OS_NAME" = "linux" ]; then xvfb-run -s '-screen 0 640x480x24 +extension GLX' pytest -vs; fi
 before_deploy:
 - export FILENAME=manuskript-$TRAVIS_BRANCH-$TRAVIS_OS_NAME.zip
 - pyinstaller manuskript.spec --clean
diff --git a/package/dependency_test.py b/package/dependency_test.py
deleted file mode 100644
index 9f0d947..0000000
--- a/package/dependency_test.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import os
-import sys
-
-realpath = os.path.realpath(__file__)
-
-sys.path.insert(1, os.path.join(os.path.dirname(realpath), '..'))
-
-from manuskript import main
diff --git a/package/prepare_linux.sh b/package/prepare_linux.sh
new file mode 100644
index 0000000..328328f
--- /dev/null
+++ b/package/prepare_linux.sh
@@ -0,0 +1,7 @@
+sudo apt-get -qq update
+sudo apt-get -qq install python3-pip python3-dev build-essential qt5-default libxml2-dev libxslt1-dev mesa-utils libgl1-mesa-glx libgl1-mesa-dev
+
+pyenv local 3.6.3
+python --version
+easy_install pip
+pip install pyqt5==5.9 lxml pytest pytest-faulthandler
\ No newline at end of file
diff --git a/package/prepare_osx.sh b/package/prepare_osx.sh
index ac1afe2..4c2bf9b 100755
--- a/package/prepare_osx.sh
+++ b/package/prepare_osx.sh
@@ -6,7 +6,7 @@ brew upgrade python
 brew install enchant
 brew postinstall python # this installs pip
 sudo -H pip3 install --upgrade pip setuptools wheel
-pip3 install pyinstaller PyQt5 lxml pyenchant
+pip3 install pyinstaller PyQt5 lxml pyenchant pytest pytest-faulthandler
 brew install qt hunspell
 # fooling PyEnchant as described in the wiki: https://github.com/olivierkes/manuskript/wiki/Package-manuskript-for-OS-X
 sudo touch /usr/local/share/aspell