diff -ru augeas-1.8.0.old/gnulib/tests/Makefile.am augeas-1.8.0/gnulib/tests/Makefile.am
--- augeas-1.8.0.old/gnulib/tests/Makefile.am	2016-09-29 20:15:19.000000000 +0100
+++ augeas-1.8.0/gnulib/tests/Makefile.am	2017-03-21 15:14:45.209782946 +0000
@@ -515,15 +515,6 @@
 
 ## end   gnulib module localename-tests
 
-## begin gnulib module lock-tests
-
-TESTS += test-lock
-check_PROGRAMS += test-lock
-test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
-EXTRA_DIST += test-lock.c
-
-## end   gnulib module lock-tests
-
 ## begin gnulib module lstat-tests
 
 TESTS += test-lstat
diff -ru augeas-1.8.0.old/gnulib/tests/Makefile.in augeas-1.8.0/gnulib/tests/Makefile.in
--- augeas-1.8.0.old/gnulib/tests/Makefile.in	2017-03-20 22:17:04.000000000 +0000
+++ augeas-1.8.0/gnulib/tests/Makefile.in	2017-03-21 15:15:05.211646356 +0000
@@ -126,7 +126,7 @@
 	test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \
 	test-limits-h$(EXEEXT) test-locale$(EXEEXT) \
 	test-localeconv$(EXEEXT) test-localename$(EXEEXT) \
-	test-lock$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
+	test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
 	test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
 	test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc-w32-1.sh \
 	test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh \
@@ -170,7 +170,7 @@
 	test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \
 	test-limits-h$(EXEEXT) test-locale$(EXEEXT) \
 	test-localeconv$(EXEEXT) test-localename$(EXEEXT) \
-	test-lock$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
+	test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
 	test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \
 	test-mbsinit$(EXEEXT) test-mbsrtowcs$(EXEEXT) \
 	test-memchr$(EXEEXT) test-nl_langinfo$(EXEEXT) \