diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17e9fba5227ef257022421455ef1569eb6838f00..863fb61371d3d00af581181cddfc4d2ce8c87a00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ Python 2.6:
   script:
   - py_version=2.6
   - EXTRA_INSTALL="numpy scipy"
-  - export FC=gfortran-7  # https://gitlab.tiker.net/inducer/leap/issues/122
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
   tags:
@@ -15,7 +14,6 @@ Python 2.7:
   script:
   - py_version=2.7
   - EXTRA_INSTALL="numpy scipy"
-  - export FC=gfortran-7  # https://gitlab.tiker.net/inducer/leap/issues/122
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
   tags:
@@ -28,7 +26,6 @@ Python 3.5:
   script:
   - py_version=3.5
   - EXTRA_INSTALL="numpy scipy"
-  - export FC=gfortran-7  # https://gitlab.tiker.net/inducer/leap/issues/122
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
   tags:
@@ -41,7 +38,6 @@ Python 3.6:
   script:
   - py_version=3.6
   - EXTRA_INSTALL="numpy scipy"
-  - export FC=gfortran-7  # https://gitlab.tiker.net/inducer/leap/issues/122
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
   tags:
diff --git a/test/test_rk.f90 b/test/test_rk.f90
index 61cc4a201039aae78b93a743be5adffb624971b0..80fc1925da8532867dc2436f0cf3a6e57b059c72 100644
--- a/test/test_rk.f90
+++ b/test/test_rk.f90
@@ -46,7 +46,9 @@ program test_rkmethod
 
     do istep = 1,ntrips(irun)
       call timestep_run(dagrt_state=state_ptr)
-      write(*,*) state%ret_state_y
+      if (associated(state%ret_state_y)) then
+        write(*,*) state%ret_state_y
+      endif
     enddo
 
     true_sol = initial_condition * exp(-2*state%ret_time_y)