diff --git a/project/TestExtras.scala b/project/TestExtras.scala
index 8fe483d094..e6b7ef02ac 100644
--- a/project/TestExtras.scala
+++ b/project/TestExtras.scala
@@ -112,7 +112,7 @@ object TestExtras {
 
       private def testTimerKey(det: Event): String = s"${det.fullyQualifiedName}.${testSelectorToId(det.selector)}"
 
-      private def testSelectorToId(sel: testing.Selector): String = sel.asInstanceOf[TestSelector].testName().replaceAll("[. ']", "_")
+      private def testSelectorToId(sel: testing.Selector): String = sel.asInstanceOf[TestSelector].testName().replaceAll("""[^\w]""", "_")
 
       private def testCounterKey(det: Event, status: Status): String = s"${det.fullyQualifiedName}.${status.toString.toLowerCase}"