diff --git a/scripts/install_build_deps.sh b/scripts/install_build_deps.sh
index 65aaa3b27..220ac8db6 100755
--- a/scripts/install_build_deps.sh
+++ b/scripts/install_build_deps.sh
@@ -62,5 +62,7 @@ if ! [ -z "$depext" ]; then
 fi
 
 if ! [ -z "$install" ]; then
-    opam install --build-test tezos-deps
+    opam install tezos-deps
+    ## This seems broken in the current opam-repo (2016-12-09)
+    ## opam install --build-test tezos-deps
 fi
diff --git a/src/tezos-deps.opam b/src/tezos-deps.opam
index cd232cf8b..86171794c 100644
--- a/src/tezos-deps.opam
+++ b/src/tezos-deps.opam
@@ -31,6 +31,6 @@ depends: [
   "tyxml"
   "js_of_ocaml"
   "sodium" {>= "0.3.0"}
-  "kaputt" { test }
-  "bisect_ppx" { test }
+  "kaputt" # { test }
+  "bisect_ppx" # { test }
 ]