diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97f8d30ad..daa6a1154 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,23 +1,23 @@
 before_script:
-  - export CXX=g++-7 CC=gcc-7
   # paths to local or network installations (the riscv toolchain and 
   # verilator are not built in the ci job as in travis)
-  - export QUESTASIM_HOME=
-  - export QUESTASIM_VERSION=
-  - export QUESTASIM_FLAGS=
-  - export RISCV=/scratch/$USER/projects/riscv_install
-  - export VERILATOR_ROOT=/scratch/$USER/projects/verilator-3.924
+  - export QUESTASIM_HOME=/usr/pack/modelsim-10.6b-kgf/questasim/
+  - export QUESTASIM_VERSION=-10.6b
+  - export QUESTASIM_FLAGS=-noautoldlibpath
+  - export CXX=g++-7.2.0 CC=gcc-7.2.0
+  - export RISCV=/usr/scratch2/larain1/gitlabci/riscv_install
+  - export VERILATOR_ROOT=/usr/scratch2/larain1/gitlabci/verilator-3.924
   # setup dependent paths
   - export PATH=${RISCV}/bin:$VERILATOR_ROOT/bin:${PATH}
   - export LIBRARY_PATH=$RISCV/lib
-  - export LD_LIBRARY_PATH=$RISCV/lib
-  - export C_INCLUDE_PATH=$RISCV/include:$VERILATOR_ROOT/include
-  - export CPLUS_INCLUDE_PATH=$RISCV/include:$VERILATOR_ROOT/include
+  - export LD_LIBRARY_PATH=$RISCV/lib:/usr/pack/gcc-7.2.0-af/linux-x64/lib64/
+  - export C_INCLUDE_PATH=$RISCV/include:$VERILATOR_ROOT/include:/usr/pack/gcc-7.2.0-af/linux-x64/include
+  - export CPLUS_INCLUDE_PATH=$RISCV/include:$VERILATOR_ROOT/include:/usr/pack/gcc-7.2.0-af/linux-x64/include
   # number of parallel jobs to use for make commands and simulation
   - export NUM_JOBS=4
   - ci/make-tmp.sh
   - git submodule update --init --recursive
-
+   
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
@@ -52,33 +52,9 @@ run-benchmarks-questa:
   dependencies:
     - build    
 
-# rv64ui-p-* tests
-run-asm-tests1-verilator:
-  stage: test_std
-  script:
-    - make -j${NUM_JOBS} run-asm-tests1-verilator 
-  dependencies:
-    - build
-
-# rv64ui-v-* tests
-run-asm-tests2-verilator:
-  stage: test_std
-  script:
-    - make -j${NUM_JOBS} run-asm-tests2-verilator 
-  dependencies:
-    - build    
-
-run-benchmarks-verilator:
-  stage: test_std
-  script:
-    - make -j${NUM_JOBS} run-benchmarks-verilator 
-  dependencies:
-    - build
-
 torture:
   stage: test_std
   script:
     - make torture-rtest
-    - make torture-rtest-verilator
   dependencies:
     - build