diff --git a/Makefile.am b/Makefile.am
index 81434ef..abf1e8d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,8 @@ AUTOMAKE_OPTIONS = no-dependencies
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = COPYING autogen.sh misc/irqbalance.service misc/irqbalance.env
 
+SUBDIRS = tests
+
 UI_DIR = ui
 AM_CFLAGS = $(LIBCAP_NG_CFLAGS) $(GLIB2_CFLAGS)
 AM_CPPFLAGS = -I${top_srcdir} -W -Wall -Wshadow -Wformat -Wundef -D_GNU_SOURCE
diff --git a/configure.ac b/configure.ac
index 38a1bee..f6c60da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,7 @@ AS_IF(
   ]
 )
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile tests/Makefile)
 
 AC_MSG_NOTICE()
 AC_MSG_NOTICE([irqbalance Version:     $VERSION])
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..293f1e7
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,2 @@
+check_SCRIPTS = runoneshot.sh 
+TESTS = runoneshot.sh
diff --git a/tests/runoneshot.sh b/tests/runoneshot.sh
new file mode 100755
index 0000000..9fb6ecd
--- /dev/null
+++ b/tests/runoneshot.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec ../irqbalance --debug --oneshot --foreground
+