diff --git a/circle.yml b/circle.yml
index 320c88adf8d88c..2cbd751dba3878 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,7 +1,7 @@
 ## Customize dependencies
 dependencies:
   pre:
-    - sudo apt-get update; sudo apt-get install bc libfuse-dev libarchive-dev
+    - sudo apt-get update; sudo apt-get install bc libfuse-dev libarchive-dev xfsprogs
   post:
     - make defconfig ARCH=lkl
     - make ARCH=lkl -j8
diff --git a/tools/lkl/tests/boot.c b/tools/lkl/tests/boot.c
index 45c2210ff3b066..b79e0aa52657c0 100644
--- a/tools/lkl/tests/boot.c
+++ b/tools/lkl/tests/boot.c
@@ -64,7 +64,7 @@ void printk(const char *str, int len)
 static int g_test_pass = 0;
 #define TEST(name) {				\
 	int ret = do_test(#name, test_##name);	\
-	if (ret) g_test_pass = -1;		\
+	if (!ret) g_test_pass = -1;		\
 	}
 
 static int do_test(char *name, int (*fn)(char *, int))
diff --git a/tools/lkl/tests/boot.sh b/tools/lkl/tests/boot.sh
index 5d8fdb6ec597e5..367b124fa2d2cf 100755
--- a/tools/lkl/tests/boot.sh
+++ b/tools/lkl/tests/boot.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 
 if [ "$1" = "-t" ]; then
     shift