diff --git a/lib/config.json b/lib/config.json
index 0768123..53c621d 100644
--- a/lib/config.json
+++ b/lib/config.json
@@ -3,6 +3,7 @@
 		 { "name" : "fedora-x86-64-2", "arch" : "x86_64", "jobs" : "4" },
 
 		 { "name" : "wildebeest-debian-wheezy-x86_64", "arch" : "x86_64", "jobs" : "4" },
+		 { "name" : "wildebeest-debian-wheezy-i686", "arch" : "i686", "jobs" : "2" },
 
 		 { "name" : "fedora-20-ppc64be-1", "arch" : "ppc64le", "jobs" : "3" },
 
@@ -73,6 +74,26 @@
 		     "builddir" : "debian-x86-64-cc-with-index",
 		     "slavenames" : [ "wildebeest-debian-wheezy-x86_64" ] },
 
+		   { "name" : "Debian-i686-native-gdbserver",
+		     "type" : "NativeGDBServer_c32t32",
+		     "builddir" : "debian-i686-native-gdbserver",
+		     "slavenames" : [ "wildebeest-debian-wheezy-i686" ] },
+
+		   { "name" : "Debian-i686-native-extended-gdbserver",
+		     "type" : "NativeExtendedGDBServer_c32t32",
+		     "builddir" : "debian-i686-native-extended-gdbserver",
+		     "slavenames" : [ "wildebeest-debian-wheezy-i686" ] },
+
+		   { "name" : "Debian-i686-cc-with-index",
+		     "type" : "IndexBuild_c32t32",
+		     "builddir" : "debian-i686-cc-with-index",
+		     "slavenames" : [ "wildebeest-debian-wheezy-i686" ] },
+
+		   { "name" : "Debian-i686",
+		     "type" : "Plain_c32t32",
+		     "builddir" : "debian-i686",
+		     "slavenames" : [ "wildebeest-debian-wheezy-i686" ] },
+
 
 
 		   { "name" : "Fedora-ppc64be-m64", "type" : "Plain_c64t64",
@@ -123,6 +144,10 @@
 					  "Debian-x86_64-native-gdbserver-m64",
 					  "Debian-x86_64-native-extended-gdbserver-m64",
 					  "Debian-x86_64-cc-with-index",
+					  "Debian-i686-native-gdbserver",
+					  "Debian-i686-native-extended-gdbserver",
+					  "Debian-i686-cc-with-index",
+					  "Debian-i686",
 
 					  "Fedora-ppc64be-m64",
 					  "Fedora-ppc64be-native-gdbserver-m64",
diff --git a/master.cfg b/master.cfg
index 08bfdea..8b92c95 100644
--- a/master.cfg
+++ b/master.cfg
@@ -569,6 +569,11 @@ class RunTestGDBNativeGDBServer_c64t32 (BuildAndTestGDBFactory):
     """Compiling on 64-bit, testing native-gdbserver on 32-bit."""
     extra_make_check_flags = [ r'RUNTESTFLAGS=--target_board native-gdbserver/-m32' ]
 
+class RunTestGDBNativeGDBServer_c32t32 (BuildAndTestGDBFactory):
+    """Compiling on 32-bit, testing native-gdbserver on 32-bit."""
+    extra_conf_flags = [ 'CFLAGS=-m32']
+    extra_make_check_flags = [ 'RUNTESTFLAGS=--target_board native-gdbserver/-m32']
+
 class RunTestGDBNativeExtendedGDBServer_c64t64 (BuildAndTestGDBFactory):
     """Compiling on 64-bit, testing native-extended-gdbserver on 64-bit."""
     extra_make_check_flags = [ r'RUNTESTFLAGS=--target_board native-extended-gdbserver' ]
@@ -577,11 +582,23 @@ class RunTestGDBNativeExtendedGDBServer_c64t32 (BuildAndTestGDBFactory):
     """Compiling on 64-bit, testing native-extended-gdbserver on 32-bit."""
     extra_make_check_flags = [ r'RUNTESTFLAGS=--target_board native-extended-gdbserver/-m32' ]
 
+class RunTestGDBNativeExtendedGDBServer_c32t32 (BuildAndTestGDBFactory):
+    """Compiling on 64-bit, testing native-extended-gdbserver on 32-bit."""
+    extra_conf_flags = [ 'CFLAGS=-m32']
+    extra_make_check_flags = [ r'RUNTESTFLAGS=--target_board native-extended-gdbserver/-m32' ]
+
 class RunTestGDBIndexBuild (BuildAndTestGDBFactory):
-    """Testing with the "cc-with-tweaks.sh" passing -i.  FIXME: include bitness here."""
+    """Testing with the "cc-with-tweaks.sh" passing -i."""
     extra_make_check_flags = [ WithProperties (r'CC_FOR_TARGET=/bin/sh %s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i gcc', r'builddir'),
                                WithProperties (r'CXX_FOR_TARGET=/bin/sh %s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i g++', r'builddir') ]
 
+class RunTestGDBIndexBuild_c32t32 (BuildAndTestGDBFactory):
+    """Testing with the "cc-with-tweaks.sh" passing -i.  32-bit version"""
+    extra_conf_flags = [ 'CFLAGS=-m32' ]
+    extra_make_check_flags = [ WithProperties (r'CC_FOR_TARGET=/bin/sh %s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i gcc', r'builddir'),
+                               WithProperties (r'CXX_FOR_TARGET=/bin/sh %s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i g++', r'builddir'),
+                               'RUNTESTFLAGS=--target_board unix/-m32']
+
 # Classes needed for BSD systems
 
 class RunTestGDBBSD_Common (BuildAndTestGDBFactory):