diff --git a/tests/run_test_octave.m b/tests/run_test_octave.m
index fb67fd5f7db2572a1066a4dddcd7ca01cf6ddc4f..b78e25ee5801813ca4da41b76346f50af2ffec56 100644
--- a/tests/run_test_octave.m
+++ b/tests/run_test_octave.m
@@ -1,4 +1,4 @@
-## Copyright (C) 2009-2012 Dynare Team
+## Copyright (C) 2009-2014 Dynare Team
 ##
 ## This file is part of Dynare.
 ##
@@ -31,9 +31,8 @@ if !strcmp(dynare_version(), getenv("DYNARE_VERSION"))
 endif
 
 ## Ask gnuplot to create graphics in text mode
-## Note that setenv() was introduced in Octave 3.0.2, for compatibility
-## with MATLAB
-putenv("GNUTERM", "dumb")
+graphics_toolkit gnuplot;
+setenv("GNUTERM", "dumb");
 
 ## Test MOD files listed in Makefile.am
 name = getenv("FILESTEM");