diff --git a/Makefile b/Makefile
index 418d22f45d..924afa0832 100644
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,8 @@ lint:
 TEST_TIMEOUT=600
 TEST_TIMEOUT2=1200
 test:
+	(cd ocaml/libs/xapi-stdext \
+	 && dune runtest --profile=$(PROFILE) --error-reporting=twice -j $(JOBS) --root .)
 	ulimit -S -t $(TEST_TIMEOUT); \
 	 (sleep $(TEST_TIMEOUT) && ps -ewwlyF --forest)& \
 	 PSTREE_SLEEP_PID=$$!; \
@@ -244,7 +246,8 @@ install: build doc sdk doc-json
 		message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt \
 		message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-storage-cli \
 		xapi-nbd varstored-guard xapi-log xapi-open-uri xapi-tracing xapi-expiry-alerts cohttp-posix xapi-inventory \
-		xapi-rrd
+		xapi-rrd \
+		xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck xapi-stdex
 # docs
 	mkdir -p $(DESTDIR)$(DOCDIR)
 	cp -r $(XAPIDOC)/jekyll $(DESTDIR)$(DOCDIR)
@@ -265,7 +268,8 @@ uninstall:
 		message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt \
 		message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-log \
 		xapi-open-uri xapi-tracing xapi-expiry-alerts cohttp-posix xapi-inventory \
-		xapi-rrd
+		xapi-rrd \
+		xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck xapi-stdext
 
 compile_flags.txt: Makefile
 	(ocamlc -config-var ocamlc_cflags;\
diff --git a/ocaml/libs/dune b/ocaml/libs/dune
new file mode 100644
index 0000000000..5c5623d9ff
--- /dev/null
+++ b/ocaml/libs/dune
@@ -0,0 +1 @@
+(vendored_dirs xapi-stdext)