diff --git a/Makefile.am b/Makefile.am
index e23a40f..4cbc114 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,5 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
-SUBDIRS = src examples
+SUBDIRS = src examples tests
 EXTRA_DIST = osmoappdesc.py
 
-if ENABLE_VTY_TESTS
-python-tests: $(BUILT_SOURCES)
-	osmotestvty.py -p $(top_srcdir) -w $(builddir) -v
-	osmotestconfig.py -p $(top_srcdir) -w $(builddir) -v
-else
-python-tests: $(BUILT_SOURCES)
-	@echo "Not running python-based tests (determined at configure-time)"
-endif
-
-check-local: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) python-tests
diff --git a/configure.ac b/configure.ac
index 6510bf4..58cbc35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,4 +60,5 @@
 AC_OUTPUT(
     src/Makefile
     examples/Makefile
+    tests/Makefile
     Makefile)
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..7581ea9
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,16 @@
+
+
+
+# Python testing
+if ENABLE_VTY_TESTS
+python-tests: $(BUILT_SOURCES)
+	osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
+	osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
+
+else
+python-tests: $(BUILT_SOURCES)
+	@echo "Not running python-based tests (determined at configure-time)"
+endif
+
+check-local: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) python-tests