diff --git a/.travis-kivy.yml b/.travis-kivy.yml
new file mode 100644
index 00000000..079284fb
--- /dev/null
+++ b/.travis-kivy.yml
@@ -0,0 +1,15 @@
+language: python3.7
+cache: pip3
+dist: bionic
+python:
+  - "3.7"
+addons:
+  apt:
+    packages:
+      - build-essential
+      - libcap-dev
+      - xvfb
+install:
+  - pip3 install -r kivy-requirements.txt
+script:
+  - python3 src/tests-kivy.py
diff --git a/Dockerfile.travis b/Dockerfile.travis
index a36e98b0..d58e7329 100644
--- a/Dockerfile.travis
+++ b/Dockerfile.travis
@@ -14,6 +14,8 @@ RUN add-apt-repository ppa:deadsnakes/ppa
 
 RUN apt-get -y install sudo
 
+RUN apt-get -y install git
+
 RUN apt-get install -yq --no-install-suggests --no-install-recommends \
     # travis xenial bionic
     python-setuptools libssl-dev libpq-dev python-prctl python-dev \
@@ -61,4 +63,6 @@ ENV LC_ALL en_US.UTF-8
 
 WORKDIR /home/builder/src
 
-ENTRYPOINT /usr/local/bin/travis2bash.sh
+
+# ENTRYPOINT /usr/local/bin/travis2bash.sh
+ENTRYPOINT ["/usr/local/bin/travis2bash.sh", ".travis-kivy.yml"]
diff --git a/src/tests-kivy.py b/src/tests-kivy.py
new file mode 100644
index 00000000..990dcfc8
--- /dev/null
+++ b/src/tests-kivy.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+"""Custom tests runner script for python3 kivy app"""
+import random  # noseq
+import sys
+import unittest
+
+
+def unittest_discover():
+    """Explicit test suite creation"""
+    loader = unittest.defaultTestLoader
+    loader.sortTestMethodsUsing = lambda a, b: random.randint(-1, 1)
+    return loader.discover('bitmessagekivy.tests')
+
+
+if __name__ == "__main__":
+    result = unittest.TextTestRunner(verbosity=2).run(unittest_discover())
+    sys.exit(not result.wasSuccessful())