diff --git a/Makefile b/Makefile
index dc59736..69ca31e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,12 @@ else
 	@echo "Try 'make install'"
 endif
 
-test: test_cleanup
+test:
+	make -C ../nilmrun
+
+test_trainola:
+	@make install >/dev/null
+	nilmtools/trainola.py
 
 test_cleanup:
 	nilmtools/cleanup.py -e extras/cleanup.cfg
@@ -69,4 +74,4 @@ clean::
 gitclean::
 	git clean -dXf
 
-.PHONY: all version dist sdist install clean gitclean
+.PHONY: all version dist sdist install clean gitclean test
diff --git a/setup.py b/setup.py
index 06ca1a7..e616e85 100755
--- a/setup.py
+++ b/setup.py
@@ -79,6 +79,7 @@ setup(name='nilmtools',
               'nilm-sinefit = nilmtools.sinefit:main',
               'nilm-cleanup = nilmtools.cleanup:main',
               'nilm-median = nilmtools.median:main',
+              'nilm-trainola = nilmtools.trainola:main',
               ],
           },
       zip_safe = False,