diff --git a/Makefile.am b/Makefile.am
index 7cb803356..7ed27cc32 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,8 @@ SUBDIRS = 		\
 	data		\
 	module		\
 	po		\
-	sendto
+	sendto  \
+	test
 
 DIST_DOCS =			\
 	CHANGELOG.md		\
diff --git a/configure.ac b/configure.ac
index e97ee1893..2b706c222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -318,6 +318,24 @@ data/configs/org.blueman.Mechanism.service
 module/Makefile
 po/Makefile.in
 sendto/Makefile
+test/Makefile
+test/apps/Makefile
+test/bluez/Makefile
+test/bluez/obex/Makefile
+test/gui/Makefile
+test/gui/applet/Makefile
+test/gui/manager/Makefile
+test/main/Makefile
+test/main/applet/Makefile
+test/main/indicators/Makefile
+test/module/Makefile
+test/plugins/Makefile
+test/plugins/applet/Makefile
+test/plugins/manager/Makefile
+test/plugins/mechanism/Makefile
+test/plugins/services/Makefile
+test/services/Makefile
+test/services/meta/Makefile
 ])
 
 
diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 000000000..29222c32f
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,13 @@
+SUBDIRS =   \
+    apps    \
+    bluez   \
+    gui \
+    main    \
+    module  \
+    plugins \
+    services
+
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py \
+    test_gobject.py
diff --git a/test/apps/Makefile.am b/test/apps/Makefile.am
new file mode 100644
index 000000000..55e7e18dd
--- /dev/null
+++ b/test/apps/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST =    \
+    __init__.py
diff --git a/test/bluez/Makefile.am b/test/bluez/Makefile.am
new file mode 100644
index 000000000..3ab3f329f
--- /dev/null
+++ b/test/bluez/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS =   \
+    obex
+
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py \
+    test_manager.py
diff --git a/test/bluez/obex/Makefile.am b/test/bluez/obex/Makefile.am
new file mode 100644
index 000000000..2ef5f5500
--- /dev/null
+++ b/test/bluez/obex/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py \
+    test_manager.py
diff --git a/test/gui/Makefile.am b/test/gui/Makefile.am
new file mode 100644
index 000000000..3911e592d
--- /dev/null
+++ b/test/gui/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS =   \
+    applet  \
+    manager
+
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py
diff --git a/test/gui/applet/Makefile.am b/test/gui/applet/Makefile.am
new file mode 100644
index 000000000..3e92b4be6
--- /dev/null
+++ b/test/gui/applet/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py
diff --git a/test/gui/manager/Makefile.am b/test/gui/manager/Makefile.am
new file mode 100644
index 000000000..3e92b4be6
--- /dev/null
+++ b/test/gui/manager/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py
diff --git a/test/main/Makefile.am b/test/main/Makefile.am
new file mode 100644
index 000000000..5fc97a0c6
--- /dev/null
+++ b/test/main/Makefile.am
@@ -0,0 +1,9 @@
+SUBDIRS =   \
+    applet  \
+    indicators
+
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py \
+    test_dbus_proxies.py    \
+    test_pulseaudio_utils.py
diff --git a/test/main/applet/Makefile.am b/test/main/applet/Makefile.am
new file mode 100644
index 000000000..3e92b4be6
--- /dev/null
+++ b/test/main/applet/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py
diff --git a/test/main/indicators/Makefile.am b/test/main/indicators/Makefile.am
new file mode 100644
index 000000000..3e92b4be6
--- /dev/null
+++ b/test/main/indicators/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py
diff --git a/test/module/Makefile.am b/test/module/Makefile.am
new file mode 100644
index 000000000..3e92b4be6
--- /dev/null
+++ b/test/module/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py
diff --git a/test/plugins/Makefile.am b/test/plugins/Makefile.am
new file mode 100644
index 000000000..dc36d1e10
--- /dev/null
+++ b/test/plugins/Makefile.am
@@ -0,0 +1,9 @@
+SUBDIRS =   \
+    applet  \
+    manager  \
+    mechanism   \
+    services
+
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py
diff --git a/test/plugins/applet/Makefile.am b/test/plugins/applet/Makefile.am
new file mode 100644
index 000000000..3e92b4be6
--- /dev/null
+++ b/test/plugins/applet/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py
diff --git a/test/plugins/manager/Makefile.am b/test/plugins/manager/Makefile.am
new file mode 100644
index 000000000..3e92b4be6
--- /dev/null
+++ b/test/plugins/manager/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py
diff --git a/test/plugins/mechanism/Makefile.am b/test/plugins/mechanism/Makefile.am
new file mode 100644
index 000000000..3e92b4be6
--- /dev/null
+++ b/test/plugins/mechanism/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py
diff --git a/test/plugins/services/Makefile.am b/test/plugins/services/Makefile.am
new file mode 100644
index 000000000..3e92b4be6
--- /dev/null
+++ b/test/plugins/services/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py
diff --git a/test/services/Makefile.am b/test/services/Makefile.am
new file mode 100644
index 000000000..79d120614
--- /dev/null
+++ b/test/services/Makefile.am
@@ -0,0 +1,6 @@
+SUBDIRS = \
+    meta
+
+EXTRA_DIST =    \
+    __init__.py \
+    test_imports.py
diff --git a/test/services/meta/Makefile.am b/test/services/meta/Makefile.am
new file mode 100644
index 000000000..e69de29bb