diff --git a/stack/cas/connectorhelper.class.php b/stack/cas/connectorhelper.class.php
index 7e9103cf83..9d4d120476 100644
--- a/stack/cas/connectorhelper.class.php
+++ b/stack/cas/connectorhelper.class.php
@@ -301,7 +301,7 @@ private static function stackmaxima_nocache_call($command) {
         $casdebugging = self::$config->casdebugging;
         self::$config->casresultscache = 'none';
         self::$config->casdebugging = true;
-        self::$config->castimeout = min(30, self::$config->castimeout);
+        self::$config->castimeout = min(100, self::$config->castimeout);
 
         $connection = self::make();
         $results = $connection->compute($command);
diff --git a/stack/cas/installhelper.class.php b/stack/cas/installhelper.class.php
index b6f1befb99..01f396bdf2 100644
--- a/stack/cas/installhelper.class.php
+++ b/stack/cas/installhelper.class.php
@@ -464,7 +464,7 @@ public static function create_auto_maxima_image() {
                 $ts->instantiate();
                 if (!$ts->get_valid() || $cs->get_value() != '2') {
                     $errors = $ts->get_errors();
-                    $errmsg = "Evaluation test failed, errors: $errors";
+                    $errmsg = "Evaluation test failed, errors: $errors . " . stack_utils::get_config()->castimeout;
                 } else {
                     // It worked!
                     $errmsg = '';