diff --git a/build/buildbot/config/StellarWerx64.xml b/build/buildbot/config/StellarWerx64.xml
index 7472b9c6ea..d1a218b344 100644
--- a/build/buildbot/config/StellarWerx64.xml
+++ b/build/buildbot/config/StellarWerx64.xml
@@ -15,7 +15,7 @@
     <scheduler>stable_quick</scheduler>
     <steps>
         <checkout branch="{$STABLE_BRANCH}"/>
-        <configure/>
+        <configure options="--enable-compat26"/>
         <compile-all utils="false"/>
         <run-tests/>
     </steps>
diff --git a/build/buildbot/config/TBITCWXBUILDBOT.xml b/build/buildbot/config/TBITCWXBUILDBOT.xml
index 03908e130a..756c26a99a 100644
--- a/build/buildbot/config/TBITCWXBUILDBOT.xml
+++ b/build/buildbot/config/TBITCWXBUILDBOT.xml
@@ -12,7 +12,7 @@
 <build>
     <name>MinGW x86 trunk</name>
     <builddir>tbitcwxbuildbot_mingw_trunk</builddir>
-    <!--scheduler>daily_0600</scheduler-->
+    <scheduler>trunk_quick</scheduler>
     <steps>
         <checkout/>
         <configure options="--host=i586-mingw32msvc
@@ -24,7 +24,7 @@
 <build>
     <name>MinGW x86 stable</name>
     <builddir>tbitcwxbuildbot_mingw_stable</builddir>
-    <!--scheduler>daily_0600</scheduler-->
+    <scheduler>daily_0600</scheduler>
     <steps>
         <checkout branch="{$STABLE_BRANCH}"/>
         <configure options="--host=i586-mingw32msvc
diff --git a/build/buildbot/config/brandt32.xml b/build/buildbot/config/brandt32.xml
index 6822ef4989..c837f30075 100644
--- a/build/buildbot/config/brandt32.xml
+++ b/build/buildbot/config/brandt32.xml
@@ -15,7 +15,7 @@
     <scheduler>trunk_quick</scheduler>
     <steps>
         <checkout/>
-        <configure/>
+        <configure options="--enable-compat28"/>
         <compile-all/>
         <run-tests/>
     </steps>
@@ -48,7 +48,7 @@
 <build>
     <name>Linux x86 wxDFB trunk</name>
     <builddir>brandt32_dfb_trunk</builddir>
-    <!--scheduler>daily_0600</scheduler-->
+    <scheduler>daily_0600</scheduler>
     <steps>
         <checkout/>
         <configure options="--with-directfb"/>
@@ -60,7 +60,7 @@
 <build>
     <name>Linux x86 wxDFB stable</name>
     <builddir>brandt32_dfb_stable</builddir>
-    <!--scheduler>daily_0600</scheduler-->
+    <scheduler>daily_0600</scheduler>
     <steps>
         <checkout branch="{$STABLE_BRANCH}"/>
         <configure options="--with-directfb"/>
diff --git a/build/buildbot/config/brandt64.xml b/build/buildbot/config/brandt64.xml
deleted file mode 100644
index 4be54c2bff..0000000000
--- a/build/buildbot/config/brandt64.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       brandt64.xml
-    RCS-ID:     $Id$
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="include/unix.xml"/>
-
-<build>
-    <name>Linux x86_64 wxGTK trunk static</name>
-    <builddir>brandt64_gtk</builddir>
-    <!--scheduler>daily_0800</scheduler-->
-    <steps>
-        <checkout/>
-        <configure options="--disable-shared --enable-opengl --enable-svg
-                            --enable-aui --with-gtk=2 --enable-graphics_ctx"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-</bot>
diff --git a/build/buildbot/config/run-tests.sh b/build/buildbot/config/run-tests.sh
deleted file mode 100755
index eb22eae62e..0000000000
--- a/build/buildbot/config/run-tests.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-# Run the test suites
-# Running them one at a time gives more readable results and shows up errors
-# in the suite names.
-set -e
-cd tests
-
-case `uname -sm` in
-    CYGWIN*|MINGW32*)   PATH=../lib:$PATH ;;
-    Darwin*)            DYLD_LIBRARY_PATH=../lib:$DYLD_LIBRARY_PATH ;;
-    *)                  LD_LIBRARY_PATH=../lib:$LD_LIBRARY_PATH ;;
-esac
-
-test -x test_gui && TEST_GUI=./test_gui
-ERR=0
-
-for prog in ./test $TEST_GUI; do
-    if [ -x $prog ]; then
-        SUITES=`$prog -l | grep '^  [^ ]'`
-        for SUITE in $SUITES; do
-            echo
-            echo $SUITE
-            echo $SUITE | sed 's/./-/g'
-            $prog $SUITE || ERR=1
-            echo
-        done
-    fi
-done
-
-exit $ERR