diff --git a/master.cfg b/master.cfg
index 2d88f28..a271008 100644
--- a/master.cfg
+++ b/master.cfg
@@ -1115,10 +1115,8 @@ class RunTestGDBPlainAIX (RunTestGDBAIX_Common, RunTestGDBPlain_c64t64):
 class RunTestGDBARM_Common (BuildAndTestGDBFactory):
     """Common ARM configurations (for Yao)"""
     def __init__ (self, **kwargs):
-        self.extra_conf_flags = [ 'CC=/home/qiyao/gcc-7/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc --sysroot=/home/qiyao/gcc-7/arm-linux-gnueabihf/sysroot',
-                                  'CXX=/home/qiyao/gcc-7/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ --sysroot=/home/qiyao/gcc-7/arm-linux-gnueabihf/sysroot',
-                                  'LDFLAGS=-Wl,-dynamic-linker,/home/qiyao/gcc-7/arm-linux-gnueabihf/sysroot/lib/ld-linux-armhf.so.3 -Wl,-rpath,/home/qiyao/gcc-7/arm-linux-gnueabihf/sysroot/lib -Wl,-rpath,/home/qiyao/gcc-7/arm-linux-gnueabihf/sysroot/usr/lib -Wl,-rpath,/home/qiyao/gcc-7/arm-linux-gnueabihf/lib' ]
-        self.extra_make_check_flags.append ('--target_board unix-aarch32')
+        self.extra_conf_flags = [ 'CC=arm-linux-gnueabihf-gcc-4.8', 'CXX=arm-linux-gnueabihf-g++-4.8', '--host=arm-linux-gnueabihf' ]
+        self.extra_make_check_flags = [ 'RUNTESTFLAGS=CC_FOR_TARGET=arm-linux-gnueabihf-gcc-4.8 CXX_FOR_TARGET=arm-linux-gnueabihf-g++-4.8' ]
         BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 class RunTestGDBARMPlain (RunTestGDBARM_Common):