diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3542706f8..83e522be3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ variables:
   TERM: linux
   MATLAB_VERSION: R2020b
   OLD_MATLAB_VERSION: R2014a
+  OCTAVE_VERSION: 5.2.0
 
 # The next stanza creates the version number used for the source tarball and the
 # binary packages. Here are the following possible cases:
@@ -28,7 +29,7 @@ build_binaries:
   stage: build
   script:
     - autoreconf -si
-    - ./configure --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION PACKAGE_VERSION=$VERSION PACKAGE_STRING="dynare $VERSION"
+    - ./configure --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION --with-octave=/usr/local/octave/$OCTAVE_VERSION PACKAGE_VERSION=$VERSION PACKAGE_STRING="dynare $VERSION"
     - make -j $(nproc) LN_S="cp -p"
   artifacts:
     paths:
@@ -70,7 +71,7 @@ pkg_source:
     - rm doc/manual/source/_static/mathjax && sed -i "/^mathjax_path *=/d" doc/manual/source/conf.py
     - 'for f in configure.ac preprocessor/configure.ac mex/build/matlab/configure.ac mex/build/octave/configure.ac; do sed -i "s/^AC_INIT(\[\(.*\)\],\s*\[\(.*\)\])/AC_INIT([\1], [$VERSION])/" $f; done'
     - autoreconf -si
-    - ./configure --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION
+    - ./configure --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION --with-octave=/usr/local/octave/$OCTAVE_VERSION
     - make dist
   artifacts:
     paths:
@@ -156,7 +157,7 @@ test_octave:
     OPENBLAS_NUM_THREADS: 1
   script:
     - autoreconf -si
-    - ./configure --disable-matlab
+    - ./configure --disable-matlab --with-octave=/usr/local/octave/$OCTAVE_VERSION
     - make -j $(nproc) -C tests check-octave
   artifacts:
     paths: