diff --git a/build/buildbot/config/include/defs.xml b/build/buildbot/config/include/defs.xml
index a3531c51d8..8a68746b51 100644
--- a/build/buildbot/config/include/defs.xml
+++ b/build/buildbot/config/include/defs.xml
@@ -333,6 +333,7 @@
 -->
 <xsl:template name="run-tests">
     <xsl:param name="content"/>
+    <xsl:param name="options"/>
     <xsl:param name="msw"><is-msw/></xsl:param>
     <test>
         <defaults content="{$content}">
@@ -344,43 +345,10 @@
             <command>
                 <xsl:choose>
                     <xsl:when test="$msw = 'true'">
-                        <run-tests-win/>
+                        <run-tests-win options="{$options}"/>
                     </xsl:when>
                     <xsl:otherwise>
-                        <run-tests-unix/>
-                    </xsl:otherwise>
-                </xsl:choose>
-            </command>
-        </copy-with-defaults>
-    </test>
-</xsl:template>
-
-<!--
-    run-tests-with-timing - build step to run the test suites with extra timing
-    option.
-
-    Usage: as <test>
-
-    Typically just:
-        <run-tests-with-timing/>
--->
-<xsl:template name="run-tests-with-timing">
-    <xsl:param name="content"/>
-    <xsl:param name="msw"><is-msw/></xsl:param>
-    <test>
-        <defaults content="{$content}">
-            <description>running tests with timing</description>
-            <descriptionDone>run tests with timing</descriptionDone>
-            <warnOnFailure/>
-        </defaults>
-        <copy-with-defaults content="{$content}">
-            <command>
-                <xsl:choose>
-                    <xsl:when test="$msw = 'true'">
-                        <run-tests-with-timing-win/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <run-tests-with-timing-unix/>
+                        <run-tests-unix options="{$options}"/>
                     </xsl:otherwise>
                 </xsl:choose>
             </command>
@@ -393,6 +361,7 @@
     simple command so that these aren't necessary.
 -->
 <xsl:template name="run-tests-win">
+    <xsl:param name="options"/>
 <normalize-space>
 cd tests &amp;&amp;
 (for /d %x in (..\lib\*_dll) do @PATH=%x;%PATH%) &amp;&amp;
@@ -402,26 +371,10 @@ cd tests &amp;&amp;
 </xsl:template>
 
 <xsl:template name="run-tests-unix">
+    <xsl:param name="options"/>
 <normalize-space>
 cd tests &amp;&amp;
-./test &amp;&amp;
-if [ -n "$DISPLAY" -a -x test_gui ]; then ./test_gui; fi
-</normalize-space>
-</xsl:template>
-
-<xsl:template name="run-tests-with-timing-win">
-<normalize-space>
-cd tests &amp;&amp;
-(for /d %x in (..\lib\*_dll) do @PATH=%x;%PATH%) &amp;&amp;
-(for /d %x in (*) do @if exist %x\test.exe %x\test -t) &amp;&amp;
-(for /d %x in (*) do @if exist %x\test_gui.exe %x\test_gui -t)
-</normalize-space>
-</xsl:template>
-
-<xsl:template name="run-tests-with-timing-unix">
-<normalize-space>
-cd tests &amp;&amp;
-./test -t &amp;&amp;
+./test <xsl:value-of select="normalize-space($options)"/> &amp;&amp;
 if [ -n "$DISPLAY" -a -x test_gui ]; then ./test_gui; fi
 </normalize-space>
 </xsl:template>
diff --git a/build/buildbot/config/ravnsgaard.xml b/build/buildbot/config/ravnsgaard.xml
index ae0aab975d..fa515d9794 100644
--- a/build/buildbot/config/ravnsgaard.xml
+++ b/build/buildbot/config/ravnsgaard.xml
@@ -28,7 +28,7 @@
             <checkout/>
             <configure options="--with-gtk --disable-debug --enable-stl --enable-std_iostreams --enable-std_string --disable-compat28"/>
             <compile-all/>
-            <run-tests-with-timing/>
+            <run-tests options="-t"/>
         </steps>
     </build>