diff --git a/pom.xml b/pom.xml
index 62c4bb247ff..2a62d8e111e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
             <groupId>org.jboss.byteman</groupId>
             <artifactId>byteman-bmunit</artifactId>
             <version>4.0.20</version>
-            <scope>provided</scope>
+            <scope>test</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/tests/junit-functional/org/jgroups/tests/RelayTest.java b/tests/junit-functional/org/jgroups/tests/RelayTest.java
index 8af1aa1942a..afda71dae76 100644
--- a/tests/junit-functional/org/jgroups/tests/RelayTest.java
+++ b/tests/junit-functional/org/jgroups/tests/RelayTest.java
@@ -408,7 +408,7 @@ public void testSitesUp(Class<? extends RELAY> cl) throws Exception {
               .map(ch -> (RELAY)ch.getProtocolStack().findProtocol(RELAY.class))
               .forEach(r -> r.setRouteStatusListener(new DefaultRouteStatusListener(r::getAddress).verbose(false)));
 
-            // now stop A; B will become new site master and we should get a site-down(NYC), then site-up(NYC)
+            // now stop A; B will become new site master, and we should get a site-down(NYC), then site-up(NYC)
             Util.close(a);
             Util.waitUntil(5000, 500, () -> Stream.of(d,e,f,_g,_h,_i)
               .map(ch -> (RELAY)ch.getProtocolStack().findProtocol(RELAY.class))
@@ -840,7 +840,7 @@ public void testFailover(Class<? extends RELAY> cl) throws Exception {
         Util.waitUntil(3000, 100,
                        () -> ((RELAY)d.getProtocolStack().findProtocol(RELAY.class)).isSiteMaster());
         MyReceiver<Message> r=getReceiver(d);
-        Util.waitUntil(200000, 200, () -> r.size() == 5);
+        Util.waitUntil(2000, 200, () -> r.size() == 5);
 
         Table<Message> send_win=unicast.getSendWindow(target);
         // wait until the ack from D has been received
diff --git a/src/org/jgroups/util/ProfilingHelper.java b/tests/util/org/jgroups/util/ProfilingHelper.java
similarity index 100%
rename from src/org/jgroups/util/ProfilingHelper.java
rename to tests/util/org/jgroups/util/ProfilingHelper.java
diff --git a/src/org/jgroups/util/ProtPerfHelper.java b/tests/util/org/jgroups/util/ProtPerfHelper.java
similarity index 100%
rename from src/org/jgroups/util/ProtPerfHelper.java
rename to tests/util/org/jgroups/util/ProtPerfHelper.java