diff --git a/lib/config.json b/lib/config.json
--- a/lib/config.json
+++ b/lib/config.json
@@ -43,7 +43,11 @@
 		 { "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" }
+		   "admin" : "qiyaoltc@gmail.com" },
+		 { "name" : "solaris11-amd64", "arch" : "x86_64", "jobs" : "4",
+		   "admin" : "ro@cebitec.uni-bielefeld.de" },
+		 { "name" : "solaris11-sparcv9", "arch" : "sparcv9", "jobs" : "4",
+		   "admin" : "ro@cebitec.uni-bielefeld.de" }
 	       ],
 
     "builders" : [ { "name" : "Fedora-x86_64-m64", "type" : "Plain_c64t64",
@@ -330,7 +334,21 @@
 		     "builddir" : "ubuntu-aarch32-native-extended-gdbserver-m32",
 		     "tags" : [ "ubuntu", "aarch32", "native-extended-gdbserver",
 				"m32", "MAIL" ],
-		     "slavenames" : [ "ubuntu-trusty-aarch32-1" ] }
+		     "slavenames" : [ "ubuntu-trusty-aarch32-1" ] },
+
+		   { "name" : "Solaris11-amd64-m64",
+		     "arch_triplet" : "amd64-pc-solaris2.11",
+		     "type" : "PlainSolaris_c64",
+		     "builddir" : "solaris11-amd64-m64",
+		     "tags" : [ "solaris", "solaris11", "x86_64", "m64", "TEST" ],
+		     "slavenames" : [ "solaris11-amd64" ] },
+
+		   { "name" : "Solaris11-sparcv9-m64",
+		     "arch_triplet" : "sparcv9-sun-solaris2.11",
+		     "type" : "PlainSolaris_c64",
+		     "builddir" : "solaris11-sparcv9-m64",
+		     "tags" : [ "solaris", "solaris11", "sparcv9", "m64", "TEST" ],
+		     "slavenames" : [ "solaris11-sparcv9" ] }
 		 ],
 
     "schedulers" : [ { "type" : "AnyBranchScheduler", "name" : "master",
@@ -388,7 +406,10 @@
 
 					  "Ubuntu-AArch32-m32",
 					  "Ubuntu-AArch32-native-gdbserver-m32",
-					  "Ubuntu-AArch32-native-extended-gdbserver-m32" ]
+					  "Ubuntu-AArch32-native-extended-gdbserver-m32",
+
+					  "Solaris11-amd64-m64",
+					  "Solaris11-sparcv9-m64" ]
 		     },
 
 		     { "type" : "Nightly", "name" : "racy",
@@ -481,7 +502,9 @@
 					  "Ubuntu-AArch64-native-gdbserver-m64",
 					  "Ubuntu-AArch32-m32",
 					  "Ubuntu-AArch32-native-gdbserver-m32",
-					  "Ubuntu-AArch32-native-extended-gdbserver-m32" ]
+					  "Ubuntu-AArch32-native-extended-gdbserver-m32",
+					  "Solaris11-amd64-m64",
+					  "Solaris11-sparcv9-m64" ]
 		     }
 		   ]
 }
diff --git a/master.cfg b/master.cfg
--- a/master.cfg
+++ b/master.cfg
@@ -1269,6 +1269,22 @@ class RunTestGDBPlainAIX (RunTestGDBAIX_
     """Compiling for AIX"""
     pass
 
+# Classes needed for Solaris systems
+
+class RunTestGDBSolaris_Common (BuildAndTestGDBFactory):
+    """Common Solaris test configurations"""
+    def __init__ (self, **kwargs):
+        self.enable_targets_all = False
+        self.make_command = 'gmake'
+        self.run_testsuite = False
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
+
+class RunTestGDBPlainSolaris_c64 (RunTestGDBSolaris_Common):
+    """Compiling for Solaris"""
+    def __init__ (self, **kwargs):
+        self.extra_CFLAGS = [ '-m64' ]
+        self.extra_CXXFLAGS = self.extra_CFLAGS
+
 # Classes needed for ARM (running on Aarch64, on Yao's buildslave)
 
 class RunTestGDBARM_Common (BuildAndTestGDBFactory):