diff --git a/configure.ac b/configure.ac
index f87f71e984..6df3894a20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3931,6 +3931,12 @@ else
 fi
 AM_CONDITIONAL(WITH_AUGLENS, test -n "${auglensdir}")
 
+if test -n "${auglensdir}"; then
+	auglenstestsdir="${auglensdir}/tests"
+else
+	auglenstestsdir=''
+fi
+
 AC_PATH_PROGS([AUGPARSE], [augparse], [none])
 AM_CONDITIONAL([HAVE_AUGPARSE], [test "x${AUGPARSE}" != "xnone"])
 AC_MSG_CHECKING([whether to enable Augeas configuration-management lenses tests])
@@ -3940,6 +3946,7 @@ else
 	AC_MSG_RESULT(no)
 fi
 
+dnl ----------------------------------------------------------------------
 
 AC_MSG_CHECKING(whether to install hotplug rules)
 AC_ARG_WITH(hotplug-dir,
@@ -4448,6 +4455,7 @@ AC_SUBST(systemdsystemunitdir)
 AC_SUBST(systemdshutdowndir)
 AC_SUBST(systemdtmpfilesdir)
 AC_SUBST(auglensdir)
+AC_SUBST(auglenstestsdir)
 AC_SUBST(hotplugdir)
 AC_SUBST(udevdir)
 
diff --git a/scripts/augeas/Makefile.am b/scripts/augeas/Makefile.am
index 583ccb7ddf..4537dfe60e 100644
--- a/scripts/augeas/Makefile.am
+++ b/scripts/augeas/Makefile.am
@@ -43,11 +43,14 @@ endif
 
 if WITH_AUGLENS
 # Now "make install" should cover delivery of Augeas lenses...
-# The "auglensdir" value should be set up by configure
+# The "auglensdir" and "auglenstestsdir" values should be set up by configure
 # The *.aug files are generated by rule above or by autogen.sh and/or configure
  auglens_DATA = \
     nuthostsconf.aug  nutupsconf.aug   nutupsdusers.aug   nutupsschedconf.aug \
     nutnutconf.aug    nutupsdconf.aug  nutupsmonconf.aug  nutupssetconf.aug
+
+ auglenstests_DATA = \
+    tests/test_nut.aug
 endif
 
 MAINTAINERCLEANFILES = Makefile.in .dirstamp