diff --git a/Makefile b/Makefile
index e089b03f567d9b4b180f27a5fa5ff9c0ae866729..5a2a346439b83a409f5da00519400b2e3aef9594 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ all: Makefile.coq
 
 clean: Makefile.coq
 	+@make -f Makefile.coq clean
-	find theories \( -name "*.v.d" -o -name "*.vo" -o -name "*.aux" -o -name "*.cache" -o -name "*.glob" -o -name "*.vio" \) -print -delete
+	find theories $$(test -d tests && echo tests) \( -name "*.d" -o -name "*.vo" -o -name "*.aux" -o -name "*.cache" -o -name "*.glob" -o -name "*.vio" \) -print -delete
 	rm -f Makefile.coq
 .PHONY: clean
 
@@ -33,7 +33,7 @@ build-dep: build-dep/opam phony
 	@# dependencies, but does not actually install anything.
 	@# Reinstalling is needed with opam 1 in case the pin already exists, but the builddep
 	@# package changed.
-	@BUILD_DEP_PACKAGE="$$(egrep "^name:" build-dep/opam | sed 's/^name: *"\(.*\)" */\1/')"; \
+	@BUILD_DEP_PACKAGE="$$(egrep "^name:" build-dep/opam | sed 's/^name: *"\(.*\)" */\1/')" && \
 	  echo "# Pinning build-dep package." && \
 	  opam pin add -k path $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE".dev build-dep && \
 	  ((! opam --version | grep "^1\." > /dev/null) || ( \
diff --git a/ci b/ci
index 99c935d2007358fe4028560e96f9c136e608e696..c3b53061d2452f7ea50766915eb40312163d155a 160000
--- a/ci
+++ b/ci
@@ -1 +1 @@
-Subproject commit 99c935d2007358fe4028560e96f9c136e608e696
+Subproject commit c3b53061d2452f7ea50766915eb40312163d155a