@@ -2164,9 +2164,12 @@ static int set_mode(struct cl_engine *engine, enum bytecode_mode mode)

     }

     cli_dbgmsg("Bytecode: mode changed to %d\n", mode);

     if (engine->bytecode_mode == CL_BYTECODE_MODE_TEST) {

-	cli_errmsg("bytecode: in test mode but JIT/bytecode is about to be disabled: %d\n", mode);

-	engine->bytecode_mode = mode;

-	return -1;

+	if (mode == CL_BYTECODE_MODE_OFF || have_clamjit) {

+	    cli_errmsg("bytecode: in test mode but JIT/bytecode is about to be disabled: %d\n", mode);

+	    engine->bytecode_mode = mode;

+	    return -1;

+	}

+	return 0;

     }

     if (engine->bytecode_mode == CL_BYTECODE_MODE_JIT) {

 	cli_errmsg("bytecode: in JIT mode but JIT is about to be disabled: %d\n", mode);

@@ -142,6 +142,7 @@ START_TEST (test_retmagic_jit)

 {

     cl_init(CL_INIT_DEFAULT);

     runtest("input/retmagic.cbc", 0x1234f00d, CL_SUCCESS, 0, NULL, NULL, NULL, NULL, 0);

+    runtest("input/retmagic.cbc", 0x1234f00d, CL_SUCCESS, 0, NULL, NULL, NULL, NULL, 1);

 }

 END_TEST