diff --git a/tests/conditional_forecasts/2/fs2000_est.mod b/tests/conditional_forecasts/2/fs2000_est.mod
index db6f5e3ab18d7309b49d076d927131d18e463224..9786c1885ab66326bc12abf66262b985af752402 100644
--- a/tests/conditional_forecasts/2/fs2000_est.mod
+++ b/tests/conditional_forecasts/2/fs2000_est.mod
@@ -120,25 +120,16 @@ end;
 
 conditional_forecast(parameter_set=prior_mode, controlled_varexo=(e_a,e_m));
 
-if ~(exist('OCTAVE_VERSION') && octave_ver_less_than('3.4.0'))
 plot_conditional_forecast(periods=10) gy_obs gp_obs;
-end
 
 conditional_forecast(parameter_set=posterior_mode, controlled_varexo=(e_a,e_m));
 
-if ~(exist('OCTAVE_VERSION') && octave_ver_less_than('3.4.0'))
 plot_conditional_forecast(periods=10) gy_obs gp_obs;
-end
 
 conditional_forecast(parameter_set=posterior_mean, controlled_varexo=(e_a,e_m));
 
-if ~(exist('OCTAVE_VERSION') && octave_ver_less_than('3.4.0'))
 plot_conditional_forecast(periods=10) gy_obs gp_obs;
-end
 
 conditional_forecast(parameter_set=posterior_median, controlled_varexo=(e_a,e_m));
 
-if ~(exist('OCTAVE_VERSION') && octave_ver_less_than('3.4.0'))
 plot_conditional_forecast(periods=10) gy_obs gp_obs;
-end
-
diff --git a/tests/seeds.mod b/tests/seeds.mod
index 02b24f90c998dd2386a11f0d062eb77ca799b570..467b80a0bee14e22f6671f0a84cbfe98d9e2e7e5 100644
--- a/tests/seeds.mod
+++ b/tests/seeds.mod
@@ -86,7 +86,7 @@ if any(abs(t4(:))>1e-12)
    error('Test failure:: Problem with the seed of the random number algorithm')
 end
 
-if ~exist('OCTAVE_VERSION') && ~matlab_ver_less_than('7.7')
+if ~isoctave && ~matlab_ver_less_than('7.7')
 
     set_dynare_seed('mlfg6331_64',0)
     stoch_simul(periods=1000,irf=0,nomoments);