diff --git a/master.cfg b/master.cfg
index cc6fe59..a774fbd 100644
--- a/master.cfg
+++ b/master.cfg
@@ -447,6 +447,7 @@ The parameters of the class are:
     def __init__ (self, architecture_triplet = []):
         factory.BuildFactory.__init__ (self)
 
+        self.architecture_triplet = architecture_triplet
         self.extra_conf_flags = None
 
         self.extra_make_flags = None
@@ -529,84 +530,84 @@ The parameters of the class are:
 
 class RunTestGDBPlain_c64t64 (BuildAndTestGDBFactory):
     """Compiling for 64-bit, testing on 64-bit."""
-    def __init__ (self, architecture_triplet):
-        BuildAndTestGDBFactory.__init__ (self, architecture_triplet)
+    def __init__ (self, **kwargs):
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 class RunTestGDBPlain_c32t32 (BuildAndTestGDBFactory):
     """Compiling on 32-bit, testing on 32-bit."""
-    def __init__ (self, architecture_triplet):
+    def __init__ (self, **kwargs):
         self.extra_conf_flags = [ r'CFLAGS=-m32' ]
         self.extra_make_check_flags = [ r'RUNTESTFLAGS=--target_board unix/-m32' ]
-        BuildAndTestGDBFactory.__init__ (self, architecture_triplet)
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 class RunTestGDBm32_c64t32 (BuildAndTestGDBFactory):
     """Compiling on 64-bit, testing on 32-bit."""
-    def __init__ (self, architecture_triplet):
+    def __init__ (self, **kwargs):
         self.extra_make_check_flags = [ r'RUNTESTFLAGS=--target_board unix/-m32' ]
-        BuildAndTestGDBFactory.__init__ (self, architecture_triplet)
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 class RunTestGDBNativeGDBServer_c64t64 (BuildAndTestGDBFactory):
     """Compiling on 64-bit, testing native-gdbserver on 64-bit."""
-    def __init__ (self, architecture_triplet):
+    def __init__ (self, **kwargs):
         self.extra_make_check_flags = [ r'RUNTESTFLAGS=--target_board native-gdbserver' ]
-        BuildAndTestGDBFactory.__init__ (self, architecture_triplet)
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 class RunTestGDBNativeGDBServer_c64t32 (BuildAndTestGDBFactory):
     """Compiling on 64-bit, testing native-gdbserver on 32-bit."""
-    def __init__ (self, architecture_triplet):
+    def __init__ (self, **kwargs):
         self.extra_make_check_flags = [ r'RUNTESTFLAGS=--target_board native-gdbserver/-m32' ]
-        BuildAndTestGDBFactory.__init__ (self, architecture_triplet)
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 class RunTestGDBNativeGDBServer_c32t32 (BuildAndTestGDBFactory):
     """Compiling on 32-bit, testing native-gdbserver on 32-bit."""
-    def __init__ (self, architecture_triplet):
+    def __init__ (self, **kwargs):
         self.extra_conf_flags = [ 'CFLAGS=-m32']
         self.extra_make_check_flags = [ 'RUNTESTFLAGS=--target_board native-gdbserver/-m32']
-        BuildAndTestGDBFactory.__init__ (self, architecture_triplet)
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 class RunTestGDBNativeExtendedGDBServer_c64t64 (BuildAndTestGDBFactory):
     """Compiling on 64-bit, testing native-extended-gdbserver on 64-bit."""
-    def __init__ (self, architecture_triplet):
+    def __init__ (self, **kwargs):
         self.extra_make_check_flags = [ r'RUNTESTFLAGS=--target_board native-extended-gdbserver' ]
-        BuildAndTestGDBFactory.__init__ (self, architecture_triplet)
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 class RunTestGDBNativeExtendedGDBServer_c64t32 (BuildAndTestGDBFactory):
     """Compiling on 64-bit, testing native-extended-gdbserver on 32-bit."""
-    def __init__ (self, architecture_triplet):
+    def __init__ (self, **kwargs):
         self.extra_make_check_flags = [ r'RUNTESTFLAGS=--target_board native-extended-gdbserver/-m32' ]
-        BuildAndTestGDBFactory.__init__ (self, architecture_triplet)
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 class RunTestGDBNativeExtendedGDBServer_c32t32 (BuildAndTestGDBFactory):
     """Compiling on 64-bit, testing native-extended-gdbserver on 32-bit."""
-    def __init__ (self, architecture_triplet):
+    def __init__ (self, **kwargs):
         self.extra_conf_flags = [ 'CFLAGS=-m32']
         self.extra_make_check_flags = [ r'RUNTESTFLAGS=--target_board native-extended-gdbserver/-m32' ]
-        BuildAndTestGDBFactory.__init__ (self, architecture_triplet)
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 class RunTestGDBIndexBuild (BuildAndTestGDBFactory):
     """Testing with the "cc-with-tweaks.sh" passing -i."""
-    def __init__ (self, architecture_triplet):
+    def __init__ (self, **kwargs):
         self.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') ]
-        BuildAndTestGDBFactory.__init__ (self, architecture_triplet)
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 class RunTestGDBIndexBuild_c32t32 (BuildAndTestGDBFactory):
     """Testing with the "cc-with-tweaks.sh" passing -i.  32-bit version"""
-    def __init__ (self, architecture_triplet):
+    def __init__ (self, **kwargs):
         self.extra_conf_flags = [ 'CFLAGS=-m32' ]
         self.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' ]
-        BuildAndTestGDBFactory.__init__ (self, architecture_triplet)
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 # Classes needed for BSD systems
 
 class RunTestGDBBSD_Common (BuildAndTestGDBFactory):
     """Common BSD test configurations"""
-    def __init__ (self, architecture_triplet):
+    def __init__ (self, **kwargs):
         self.extra_conf_flags = [ 'CFLAGS=-I/usr/local/include', '--disable-werror' ]
         self.make_command = 'gmake'
-        BuildAndTestGDBFactory.__init__ (self, architecture_triplet)
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 class RunTestGDBPlainBSD_c64t64 (RunTestGDBPlain_c64t64, RunTestGDBBSD_Common):
     """Compiling for 64-bit, testing on 64-bit."""
@@ -673,12 +674,12 @@ def load_config (c):
     c['builders'] = []
     for b in config['builders']:
         if 'arch_triplet' in b:
-            arch_triplet = [ b.pop ('arch_triplet') ]
+            architecture_triplet = [ b.pop ('arch_triplet') ]
         else:
-            arch_triplet = []
+            architecture_triplet = []
         btype = b.pop ('type')
         factory = globals ()[ "RunTestGDB%s" % btype ]
-        b['factory'] = factory (arch_triplet)
+        b['factory'] = factory (architecture_triplet = architecture_triplet)
         b['canStartBuild'] = DefaultGDBCanStartBuild
         b['mergeRequests'] = False
         c['builders'].append (b)