diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 811124111ef326f9897c1e5465a72ebd713b991a..358072421540bd7bba8e318e6c7f3fa5b81dc757 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,19 +1,3 @@
-before_script:
-  - apt-get update -qq && apt-get install -y -qq python cmake python-dev libblas-dev liblapacke-dev libatlas-base-dev libatlas-dev gcc libgfortran3 libgcc1 libgcc-4.9-dev gfortran python-pip openmpi-bin libopenmpi-dev libhdf5-openmpi-dev python-numpy python-scipy python-pyopencl python-scitools libfftw3-dev libfftw3-mpi-dev python-pytest cython
-  - pip install --upgrade pip
-  - pip install --upgrade setuptools
-  - pip install mpi4py
-  - pip install sphinx
-  - pip install wheel
-  - wget https://pypi.python.org/packages/22/82/64dada5382a60471f85f16eb7d01cc1a9620aea855cd665609adf6fdbb0d/h5py-2.6.0.tar.gz
-  - tar -zxvf h5py-2.6.0.tar.gz
-  - cd h5py-2.6.0
-  - export CC=mpicc
-  - python setup.py configure --mpi --hdf5=/usr/
-  - python setup.py install
-  - cd ..
-
-
 stages:
   - build
   - test
@@ -24,6 +8,19 @@ stages:
 build_job:
   stage: build
   script:
+    - apt-get update -qq && apt-get install -y -qq python cmake python-dev libblas-dev liblapacke-dev libatlas-base-dev libatlas-dev gcc libgfortran3 libgcc1 libgcc-4.9-dev gfortran python-pip openmpi-bin libopenmpi-dev libhdf5-openmpi-dev python-numpy python-scipy python-pyopencl python-scitools libfftw3-dev libfftw3-mpi-dev python-pytest cython
+    - pip install --upgrade pip
+    - pip install --upgrade setuptools
+    - pip install mpi4py
+    - pip install sphinx
+    - pip install wheel
+    - wget https://pypi.python.org/packages/22/82/64dada5382a60471f85f16eb7d01cc1a9620aea855cd665609adf6fdbb0d/h5py-2.6.0.tar.gz
+    - tar -zxvf h5py-2.6.0.tar.gz
+    - cd h5py-2.6.0
+    - export CC=mpicc
+    - python setup.py configure --mpi --hdf5=/usr/
+    - python setup.py install
+    - cd ..
     - mkdir build/
     - cd build
     - cmake -D CMAKE_BUILD_TYPE=Debug -DWITH_LIB_CXX=OFF ..
@@ -35,5 +32,4 @@ test_job:
   script:
     - make test
   dependencies:
-    - build_job
-		
+    - build_job
\ No newline at end of file