diff --git a/Makefile.am b/Makefile.am
index fb6359a..2dfef4d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+SUBDIRS = . tests
+
 ACLOCAL_AMFLAGS = -I m4
 
 AM_CFLAGS = $(WARN_CFLAGS)
@@ -59,14 +61,6 @@ endif
 dist_man8_MANS = pam_yubico.8
 DISTCLEANFILES = $(dist_man1_MANS) $(dist_man8_MANS)
 
-# Self tests.
-
-AM_LDFLAGS = -no-install
-LDADD = ./pam_yubico.la
-
-check_PROGRAMS = test
-TESTS = $(check_PROGRAMS)
-
 MANSOURCES = pam_yubico.8.txt ykpamcfg.1.txt
 EXTRA_DIST = doc/LocalAuthenticationUsingChallengeResponse.txt doc/MacOSXChallengeResponse.txt doc/TwoFactorPAMConfiguration.txt doc/UbuntuFreeRadiusYubiKey.txt doc/YubiKeyAndFreeRADIUSviaPAM.txt doc/YubiKeyAndFreeRADIUSwithsinglefactorauthenticationviaPAM.txt doc/YubiKeyAndOpenVPNviaPAM.txt doc/YubikeyAndRadiusViaPAM.txt doc/Yubikey-and-SELinux-on-Fedora-18-and-up.txt doc/YubikeyAndSSHViaPAM.txt
 EXTRA_DIST += $(MANSOURCES)
diff --git a/configure.ac b/configure.ac
index 582d170..7a0f99e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,6 +136,7 @@ fi
 
 
 AC_CONFIG_FILES(Makefile)
+AC_CONFIG_FILES(tests/Makefile)
 AC_OUTPUT
 
 AC_MSG_NOTICE([Summary of build options:
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..d28f31e
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,36 @@
+# Copyright (c) 2014 Yubico AB
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#   * Redistributions of source code must retain the above copyright
+#      notice, this list of conditions and the following disclaimer.
+#
+#   * Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials provided
+#      with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Self tests.
+
+AM_LDFLAGS = -no-install
+AM_CFLAGS=-I$(srcdir)/.. $(WARN_CFLAGS)
+LDADD = ../pam_yubico.la
+test_SOURCES = test.c
+
+check_PROGRAMS = test
+TESTS = $(check_PROGRAMS)
diff --git a/test.c b/tests/test.c
similarity index 100%
rename from test.c
rename to tests/test.c