diff --git a/lib/config.json b/lib/config.json
index efe63cc..dfc8ac6 100644
--- a/lib/config.json
+++ b/lib/config.json
@@ -57,6 +57,10 @@
 		     "builddir" : "fedora-i686",
 		     "slavenames" : [ "fedora-x86-64-1", "fedora-x86-64-2" ] },
 
+		   { "name" : "Fedora-x86_64-cxx-build-m64",
+		     "type" : "PlainBuildWithCxx_c64notest",
+		     "builddir" : "fedora-x86-64-cxx-build",
+		     "slavenames" : [ "fedora-x86-64-1", "fedora-x86-64-2" ] },
 
 
 		   { "name" : "Debian-x86_64-m64",
diff --git a/master.cfg b/master.cfg
index 73af3c4..bdd1cdc 100644
--- a/master.cfg
+++ b/master.cfg
@@ -512,6 +512,9 @@ The parameters of the class are:
     CompileClass = CompileGDB
     TestClass = TestGDB
 
+    # Set this to False to skip the test
+    run_testsuite = True
+
     extra_conf_flags = None
 
     extra_make_flags = None
@@ -541,7 +544,9 @@ The parameters of the class are:
                                        descriptionDone = r"removed old build dir"))
         self.addStep (CloneOrUpdateGDBMasterRepo ())
         self.addStep (CloneOrUpdateGDBRepo ())
-        self.addStep (CopyOldGDBSumFile ())
+
+        if self.run_testsuite:
+            self.addStep (CopyOldGDBSumFile ())
 
         if not self.extra_conf_flags:
             self.extra_conf_flags = []
@@ -560,24 +565,26 @@ The parameters of the class are:
 
         if not self.extra_make_check_flags:
             self.extra_make_check_flags = []
-        if not self.test_env:
-            self.test_env = {}
 
-        if self.test_parallel:
-            self.extra_make_check_flags.append (WithProperties (r"-j%s", r'jobs'))
-            self.extra_make_check_flags.append (r'FORCE_PARALLEL=1')
+        if self.run_testsuite:
+            if not self.test_env:
+                self.test_env = {}
 
-        self.addStep (self.TestClass (self.make_command, self.extra_make_check_flags,
-                                      self.test_env))
+            if self.test_parallel:
+                self.extra_make_check_flags.append (WithProperties (r"-j%s", r'jobs'))
+                self.extra_make_check_flags.append (r'FORCE_PARALLEL=1')
 
-        self.addStep (GdbCatSumfileCommand (workdir = WithProperties (r'%s/build/gdb/testsuite',
-                                                                      r'builddir'),
-                                            description = r'analyze test results'))
-        self.addStep (FileUpload (slavesrc = WithProperties (r"%s/build/gdb/testsuite/gdb.log",
-                                                             r'builddir'),
-                                  masterdest = WithProperties (r"public_html/results/%s/gdb.log",
-                                                               r'buildername')))
-        self.addStep (SaveGDBResults ())
+            self.addStep (self.TestClass (self.make_command, self.extra_make_check_flags,
+                                          self.test_env))
+
+            self.addStep (GdbCatSumfileCommand (workdir = WithProperties (r'%s/build/gdb/testsuite',
+                                                                          r'builddir'),
+                                                description = r'analyze test results'))
+            self.addStep (FileUpload (slavesrc = WithProperties (r"%s/build/gdb/testsuite/gdb.log",
+                                                                 r'builddir'),
+                                      masterdest = WithProperties (r"public_html/results/%s/gdb.log",
+                                                                   r'buildername')))
+            self.addStep (SaveGDBResults ())
 
 
 ##################
@@ -670,6 +677,16 @@ class RunTestGDBIndexBuild_c32t32 (BuildAndTestGDBFactory):
                                         'RUNTESTFLAGS=--target_board unix/-m32' ]
         BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
+# Class for only building GDB, without testing
+
+class RunTestGDBPlainBuildWithCxx_c64notest (BuildAndTestGDBFactory):
+    """Compiling for 64-bit with --enable-build-with-cxx.  We do not test
+anything for now."""
+    def __init__ (self, **kwargs):
+        self.extra_conf_flags = [ '--enable-build-with-cxx' ]
+        self.run_testsuite = False
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
+
 # Classes needed for BSD systems
 
 class RunTestGDBBSD_Common (BuildAndTestGDBFactory):