diff --git a/lib/config.json b/lib/config.json
index 21451b5..a5b1b4f 100644
--- a/lib/config.json
+++ b/lib/config.json
@@ -210,7 +210,7 @@
 		     "slavenames" : [ "rhel-7_1-s390x-1" ] },
 
 		   { "name" : "NetBSD-x86_64-m64",
-		     "type" : "PlainBSD_c64t64",
+		     "type" : "PlainNetBSD_c64",
 		     "builddir" : "netbsd-x86_64",
 		     "tags" : [ "netbsd", "x86_64", "m64", "TEST" ],
 		     "slavenames" : [ "gdb-amd64-netbsd7" ] },
diff --git a/master.cfg b/master.cfg
index 7e57769..fd58066 100644
--- a/master.cfg
+++ b/master.cfg
@@ -1143,6 +1143,17 @@ class RunTestGDBIndexBuildBSD (RunTestGDBIndexBuild, RunTestGDBBSD_Common):
     """Testing with the "cc-with-tweaks.sh" passing -i.  FIXME: include bitness here."""
     pass
 
+class RunTestGDBNetBSD_Common (BuildAndTestGDBFactory):
+    """Common NetBSD test configurations"""
+    def __init__ (self, **kwargs):
+        self.make_command = 'gmake'
+        self.run_testsuite = False
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
+
+class RunTestGDBPlainNetBSD_c64 (RunTestGDBPlain_c64t64, RunTestGDBNetBSD_Common):
+    """Compiling (but not testing) for 64-bit"""
+    pass
+
 # Classes needed for AIX systems
 
 class RunTestGDBAIX_Common (BuildAndTestGDBFactory):