diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a5b89b6..bec7f94f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -128,8 +128,7 @@ diagnostics:
   - sed -i "s/BRANCH_NAME/$OUT_FOLDER/" ~/.config/openfisca-france-data/config.ini
   - cat ~/.config/openfisca-france-data/config.ini
   - compare-erfs-fpr-input -u -s -v
-  - cp -r /mnt/data-out/openfisca-france-data/$OUT_FOLDER/figures_directory .
-  - cp -r ./figures_directory $ROOT_FOLDER/$OUT_FOLDER/data_output
+  - cp -r /mnt/data-out/openfisca-france-data/$OUT_FOLDER/tests/figures_directory .
   stage: diagnostics
   tags:
   - openfisca
@@ -160,7 +159,7 @@ check-for-functional-changes:
   - ''
   script:
   - if `.gitlab-ci/has-functional-changes.sh` ; then echo "OK to build package" ; fi
-  only: 
+  only:
   - master
 
 build_conda_package:
diff --git a/.gitlab-ci/all_years_build_and_aggregates.yml b/.gitlab-ci/all_years_build_and_aggregates.yml
index cb129a87..8d939a26 100644
--- a/.gitlab-ci/all_years_build_and_aggregates.yml
+++ b/.gitlab-ci/all_years_build_and_aggregates.yml
@@ -31,8 +31,8 @@ aggregates-2019:
   - cp $ROOT_FOLDER/$OUT_FOLDER/openfisca_survey_manager_config_input_data-after-build-erfs-fprs-2019.ini
     ~/.config/openfisca-survey-manager/config.ini
   - python tests/erfs_fpr/integration/test_aggregates.py --year 2019
-  - mkdir -p $ROOT_FOLDER/$OUT_FOLDER
-  - cp ./*.csv $ROOT_FOLDER/$OUT_FOLDER/figures_directory
+  - mkdir -p $ROOT_FOLDER/$OUT_FOLDER/tests
+  - cp ./*.csv $ROOT_FOLDER/$OUT_FOLDER/tests
   stage: aggregates
   tags:
   - openfisca
diff --git a/.gitlab-ci/openfisca_france_data_config.ini b/.gitlab-ci/openfisca_france_data_config.ini
index 7019feae..2be2892c 100644
--- a/.gitlab-ci/openfisca_france_data_config.ini
+++ b/.gitlab-ci/openfisca_france_data_config.ini
@@ -1,3 +1,3 @@
 [paths]
-figures_directory = /mnt/data-out/openfisca-france-data/BRANCH_NAME/figures_directory
+figures_directory = /mnt/data-out/openfisca-france-data/BRANCH_NAME/tests/figures_directory
 backup = ./backup