diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de4b24e..f43ce22 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,12 +46,12 @@ test_all_modules:
         --db_password flectra
         --database test_all
         --test-enable
-        --init mis_builder_budget,mis_builder_demo,mis_builder
+        --init mis_builder_budget,mis_builder,mis_builder_demo
         --stop-after-init
         --log-level error
         --log-handler flectra.addons.mis_builder_budget:TEST
-        --log-handler flectra.addons.mis_builder_demo:TEST
         --log-handler flectra.addons.mis_builder:TEST
+        --log-handler flectra.addons.mis_builder_demo:TEST
         "
 
 
@@ -90,41 +90,6 @@ test_module_mis_builder_budget:
         --log-level error
         --log-handler flectra.addons.mis_builder_budget:TEST"
 
-test_module_mis_builder_demo:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - apt-get install -y p7zip-full
-    - apt install -y expect-dev
-    - su - flectra -c "mkdir ~/others"
-    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/reporting-engine.git ~/others/reporting-engine"
-    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
-    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
-    - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
-    - mkdir ${CI_PROJECT_DIR}/ci_data
-    - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_mis_builder_demo
-    - psql -h psql -U flectra -d test_mis_builder_demo -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_mis_builder_demo
-    - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_mis_builder_demo
-    - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-tools,~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_mis_builder_demo
-        --test-enable -i mis_builder_demo
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.mis_builder_demo:TEST"
-
 test_module_mis_builder:
   stage: testsingle
   when: on_failure
@@ -160,3 +125,38 @@ test_module_mis_builder:
         --log-level error
         --log-handler flectra.addons.mis_builder:TEST"
 
+test_module_mis_builder_demo:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - apt-get install -y p7zip-full
+    - apt install -y expect-dev
+    - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/reporting-engine.git ~/others/reporting-engine"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
+    - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
+    - mkdir ${CI_PROJECT_DIR}/ci_data
+    - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_mis_builder_demo
+    - psql -h psql -U flectra -d test_mis_builder_demo -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_mis_builder_demo
+    - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_mis_builder_demo
+    - su - flectra -c "/opt/flectra/flectra-bin
+        --addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-tools,~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_mis_builder_demo
+        --test-enable -i mis_builder_demo
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.mis_builder_demo:TEST"
+
diff --git a/README.md b/README.md
index 3638629..81ffcb1 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Available addons
 addon | version | summary
 --- | --- | ---
 [mis_builder_budget](mis_builder_budget/) | 1.0.3.5.0|         Create budgets for MIS reports
-[mis_builder_demo](mis_builder_demo/) | 1.0.3.1.1|         Demo addon for MIS Builder
 [mis_builder](mis_builder/) | 1.0.3.6.5|         Build 'Management Information System' Reports and Dashboards    
+[mis_builder_demo](mis_builder_demo/) | 1.0.3.1.1|         Demo addon for MIS Builder