diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ff00f2e3..ad8e918fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,6 +59,7 @@ build_deps:
     - if [ "${CI_PROJECT_PATH}" = "tezos/tezos" ] ; then
         ./scripts/apply_patch.sh "${CI_COMMIT_REF_NAME}" ;
       fi
+    - opam list
   tags:
     - gitlab-org
 
@@ -84,8 +85,6 @@ build:
   stage: test
   except:
     - master@tezos/tezos
-  before_script:
-    - find _build -type f -exec touch {} \;
   dependencies:
     - build
 
@@ -201,8 +200,8 @@ test:proto:sandbox:
   script:
     - ./scripts/opam-pin.sh
     - opam depext --yes ${package}
-    - opam install --yes --deps-only ${package}
-    - opam install --yes --with-test ${package}
+    - opam install --yes ${package}
+    - opam reinstall --yes --with-test ${package}
   tags:
     - gitlab-org
 
diff --git a/Makefile b/Makefile
index 0b15f211d..4007d48ac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 
 DEV ?= --dev
+PACKAGES:=$(patsubst %.opam,%,$(notdir $(shell find -name *.opam)))
 
 all:
 	@jbuilder build ${DEV} \
@@ -12,9 +13,17 @@ all:
 	@cp _build/default/src/bin_client/admin_main.exe tezos-admin-client
 	@cp _build/default/src/lib_protocol_compiler/main_native.exe tezos-protocol-compiler
 
-tezos-%.pkg:
-	@jbuilder build --dev $(patsubst %.opam,%.install, \
-				   $(shell find -name tezos-$*.opam))
+all.pkg:
+	@jbuilder build ${DEV} \
+	    $(patsubst %.opam,%.install, $(shell find -name \*.opam))
+
+$(addsuffix .pkg,${PACKAGES}): %.pkg:
+	@jbuilder build ${DEV} \
+	    $(patsubst %.opam,%.install, $(shell find -name $*.opam))
+
+$(addsuffix .test,${PACKAGES}): %.test:
+	@jbuilder build ${DEV} \
+	    @$(patsubst %/$*.opam,%,$(shell find -name $*.opam))/runtest
 
 doc-html: all
 	@jbuilder build @doc ${DEV}