diff --git a/software/beremiz-ide/buildout.hash.cfg b/software/beremiz-ide/buildout.hash.cfg
index 5c9d81f70d20b978bdaaf1cef8eb36e37b18696f..e96c74f7e7d30e3e9f62b12139a707cae1ae918f 100644
--- a/software/beremiz-ide/buildout.hash.cfg
+++ b/software/beremiz-ide/buildout.hash.cfg
@@ -15,11 +15,11 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = c4079d70ab3268234651bf6c36234b2f
+md5sum = fd556a0cb44610f0b0898b7126bd77b2
 
 [template-instance-beremiz]
 filename = instance-beremiz.cfg.jinja2.in
-md5sum = 51071494633f4ffba700baf935dc6955
+md5sum = c92317d0d754f62d3259136d1a0df1ac
 
 [template-instance-beremiz-test]
 filename = instance-beremiz-test.cfg.jinja2.in
diff --git a/software/beremiz-ide/instance-beremiz.cfg.jinja2.in b/software/beremiz-ide/instance-beremiz.cfg.jinja2.in
index 9a1558c94e94a044500cdfe942e0e8fd7cf5cb40..38714d031d6f666de0da13f6a89ea1e484726d45 100644
--- a/software/beremiz-ide/instance-beremiz.cfg.jinja2.in
+++ b/software/beremiz-ide/instance-beremiz.cfg.jinja2.in
@@ -179,7 +179,7 @@ wrapper-path = ${directory:services}/fluxbox
 recipe = slapos.recipe.template
 inline =
   export LD_LIBRARY_PATH={{ mesa_location }}/lib
-  export PATH=${directory:bin}:{{ git_bin_dir }}:{{ autoconf_bin }}:{{ automake_bin }}:{{ matiec_location }}/bin:{{ bison_location }}/bin:{{ flex_location }}/bin:{{ bin_directory }}:{{ gcc_location }}/bin:$PATH
+  export PATH=${directory:bin}:{{ git_bin_dir }}:{{ cmake_bin }}:{{ autoconf_bin }}:{{ automake_bin }}:{{ matiec_location }}/bin:{{ bison_location }}/bin:{{ flex_location }}/bin:{{ bin_directory }}:{{ gcc_location }}/bin:$PATH
   export XDG_DATA_DIR={{ gtk3_location }}/share
   export GSETTINGS_SCHEMA_DIR={{ gtk3_location }}/share/glib-2.0/schemas
   export FONTCONFIG_FILE=${font-config:output}
diff --git a/software/beremiz-ide/instance.cfg.in b/software/beremiz-ide/instance.cfg.in
index 69c447927f2158f3685575bca46656074854189b..cbee560482ddc3e8d6f01c13d45eb94ca523ed9b 100644
--- a/software/beremiz-ide/instance.cfg.in
+++ b/software/beremiz-ide/instance.cfg.in
@@ -46,6 +46,7 @@ filename = instance-beremiz.cfg
 extra-context =
   raw autoconf_bin       {{ autoconf_location }}/bin
   raw automake_bin       {{ automake_location }}/bin
+  raw cmake_bin          {{ cmake_location }}/bin
   raw bash_bin           {{ bash_location }}/bin/bash
   raw beremiz_location   {{ beremiz_location }}
   raw bison_location     {{ bison_location }}
diff --git a/software/beremiz-ide/software.cfg b/software/beremiz-ide/software.cfg
index 5cc258626763f3729e936ede0d0bb5fb9bbc9347..38a296ed233f5652191227cf0fbd06d33b40950b 100644
--- a/software/beremiz-ide/software.cfg
+++ b/software/beremiz-ide/software.cfg
@@ -3,6 +3,7 @@
 extends =
   ../../stack/slapos.cfg
   ../../component/autoconf/buildout.cfg
+  ../../component/cmake/buildout.cfg
   ../../component/flex/buildout.cfg
   ../../component/fonts/buildout.cfg
   ../../component/noVNC/buildout.cfg
@@ -108,6 +109,7 @@ type = beremiz
 context =
     key autoconf_location  autoconf:location
     key automake_location  automake:location
+    key cmake_location cmake:location
     key bash_location bash:location
     key beremiz_location beremiz-setup:setup
     key bin_directory buildout:bin-directory
diff --git a/software/beremiz-ide/test.cfg b/software/beremiz-ide/test.cfg
index c66faea76aec09b4872a7656b141cdd0f8293927..ac25154ad7b081830fa3ada382cc64c9ee854269 100644
--- a/software/beremiz-ide/test.cfg
+++ b/software/beremiz-ide/test.cfg
@@ -32,6 +32,11 @@ eggs +=
 [instance]
 type = beremiz-test
 
+# Download only open62541 sources because beremiz test needs
+# sources and will rebuild it anyway.
+[open62541]
+recipe = slapos.recipe.build:download-unpacked
+
 [gen-nxdtest.sh]
 recipe = slapos.recipe.template
 output = ${buildout:parts-directory}/gennxdtest.sh