diff --git a/lib/config.json b/lib/config.json
index 526c08f..81e1981 100644
--- a/lib/config.json
+++ b/lib/config.json
@@ -44,6 +44,8 @@
 		   "admin" : "n54@gmx.com" },
 
 		 { "name" : "ubuntu-aarch64-1", "arch" : "aarch64", "jobs" : "4",
+		   "admin" : "qiyaoltc@gmail.com" },
+		 { "name" : "ubuntu-trusty-aarch32-1", "arch" : "aarch32", "jobs" : "4",
 		   "admin" : "qiyaoltc@gmail.com" }
 	       ],
 
@@ -269,7 +271,27 @@
 		     "type" : "NativeGDBServer_c64t64",
 		     "builddir" : "ubuntu-aarch64-native-gdbserver-m64",
 		     "tags" : [ "ubuntu", "aarch64", "native-gdbserver", "m64", "MAIL" ],
-		     "slavenames" : [ "ubuntu-aarch64-1" ] }
+		     "slavenames" : [ "ubuntu-aarch64-1" ] },
+
+
+		   { "name" : "Ubuntu-AArch32-m32",
+		     "type" : "ARMPlain",
+		     "builddir" : "ubuntu-aarch32-m32",
+		     "tags" : [ "ubuntu", "aarch32", "m32", "MAIL" ],
+		     "slavenames" : [ "ubuntu-trusty-aarch32-1" ] },
+
+		   { "name" : "Ubuntu-AArch32-native-gdbserver-m32",
+		     "type" : "ARMNativeGDBServer",
+		     "builddir" : "ubuntu-aarch32-native-gdbserver-m32",
+		     "tags" : [ "ubuntu", "aarch32", "native-gdbserver", "m32", "MAIL" ],
+		     "slavenames" : [ "ubuntu-trusty-aarch32-1" ] },
+
+		   { "name" : "Ubuntu-AArch32-native-extended-gdbserver-m32",
+		     "type" : "ARMNativeExtendedGDBServer",
+		     "builddir" : "ubuntu-aarch32-native-extended-gdbserver-m32",
+		     "tags" : [ "ubuntu", "aarch32", "native-extended-gdbserver",
+				"m32", "MAIL" ],
+		     "slavenames" : [ "ubuntu-trusty-aarch32-1" ] }
 		 ],
 
     "schedulers" : [ { "type" : "AnyBranchScheduler", "name" : "master",
@@ -313,8 +335,11 @@
 					  "FreeBSD-x86_64-cc-with-index",
 
 					  "Ubuntu-AArch64-m64",
-					  "Ubuntu-AArch64-native-gdbserver-m64" ]
+					  "Ubuntu-AArch64-native-gdbserver-m64",
 
+					  "Ubuntu-AArch32-m32",
+					  "Ubuntu-AArch32-native-gdbserver-m32",
+					  "Ubuntu-AArch32-native-extended-gdbserver-m32" ]
 		     },
 
 		     { "type" : "SingleBranchScheduler", "name" : "7_12_branch",
@@ -365,7 +390,11 @@
 					  "FreeBSD-x86_64-cc-with-index",
 
 					  "Ubuntu-AArch64-m64",
-					  "Ubuntu-AArch64-native-gdbserver-m64" ]
+					  "Ubuntu-AArch64-native-gdbserver-m64",
+
+					  "Ubuntu-AArch32-m32",
+					  "Ubuntu-AArch32-native-gdbserver-m32",
+					  "Ubuntu-AArch32-native-extended-gdbserver-m32" ]
 		     },
 
 		     { "type" : "Nightly", "name" : "racy_daily",
@@ -399,8 +428,10 @@
 					  "AIX-POWER8-plain",
 					  "RHEL-s390x-m64",
 					  "Ubuntu-AArch64-m64",
-					  "Ubuntu-AArch64-native-gdbserver-m64" ]
-
+					  "Ubuntu-AArch64-native-gdbserver-m64",
+					  "Ubuntu-AArch32-m32",
+					  "Ubuntu-AArch32-native-gdbserver-m32",
+					  "Ubuntu-AArch32-native-extended-gdbserver-m32" ]
 		     }
 		   ]
 }
diff --git a/master.cfg b/master.cfg
index fbb8a94..2d88f28 100644
--- a/master.cfg
+++ b/master.cfg
@@ -982,6 +982,11 @@ The parameters of the class are:
 ##
 ##     RunTestGDBNativeGDBServer_c64t32
 
+class RunTestGDBPlain_c64t64 (BuildAndTestGDBFactory):
+    """Compiling for 64-bit, testing on 64-bit."""
+    def __init__ (self, **kwargs):
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
+
 class RunTestGDBPlain_c64t64 (BuildAndTestGDBFactory):
     """Compiling for 64-bit, testing on 64-bit."""
     def __init__ (self, **kwargs):
@@ -1105,6 +1110,29 @@ class RunTestGDBPlainAIX (RunTestGDBAIX_Common, RunTestGDBPlain_c64t64):
     """Compiling for AIX"""
     pass
 
+# Classes needed for ARM (running on Aarch64, on Yao's buildslave)
+
+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')
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
+
+class RunTestGDBARMPlain (RunTestGDBARM_Common):
+    """Compiling for ARM, testing on ARM."""
+    pass
+
+class RunTestGDBARMNativeGDBServer (RunTestGDBARM_Common, RunTestGDBNativeGDBServer_c64t64):
+    """Compiling for ARM native-gdbserver, testing on ARM."""
+    pass
+
+class RunTestGDBARMNativeExtendedGDBServer (RunTestGDBARM_Common, RunTestGDBNativeExtendedGDBServer_c64t64):
+    """Compiling for ARM native-extended-gdbserver, testing on ARM."""
+    pass
+
 # All branches that are going to be watched.
 all_gdb_filter = ChangeFilter (branch_fn = should_watch_branch)