Index: Tools/Test/Manager.cls.xml
===================================================================
diff -u -r2715 -r2770
--- Tools/Test/Manager.cls.xml	(.../Manager.cls.xml)	(revision 2715)
+++ Tools/Test/Manager.cls.xml	(.../Manager.cls.xml)	(revision 2770)
@@ -247,7 +247,7 @@
  $$$QuitOnError(classQuery.Execute(..#PackagePrefix_".TestCase"))
  while (classQuery.Next() ) {
 	#dim className=classQuery.Data("Name")
-	if $L(Substring),className'[Substring continue
+	if $length(Substring) && $$$Not(..IsValidName(className,Substring)) continue
 	#dim isAbstract As %Boolean =##class(TECH.ClassUtils).IsAbstract(className)
 	If ('isAbstract) {
 		#dim SkipTestCase As %Boolean = +$zobjclassmethod(className,"%GetParameter","SkipTestCase")
@@ -283,6 +283,31 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsValidName">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ClassName:%String,SubString:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsValid As %Boolean = 0
+	if SubString[" " {
+		set SubstringIterator = ##class(TECH.StringIterator).%New(SubString," ")
+		while $$$Not(IsValid) && SubstringIterator.HasNext() {
+			set IsValid = $zconvert(ClassName,"L") [ $zconvert(SubstringIterator.Next(),"L")
+		}
+	} elseif SubString["&" {
+		set IsValid = 1
+		set SubstringIterator = ##class(TECH.StringIterator).%New(SubString,"&")
+		while IsValid && SubstringIterator.HasNext() {
+			set IsValid = $zconvert(ClassName,"L") [ $zconvert(SubstringIterator.Next(),"L")
+		}		
+	} else {
+		set IsValid = $zconvert(ClassName,"L") [ $zconvert(SubString,"L")
+	}
+	quit IsValid
+]]></Implementation>
+</Method>
+
 <Method name="ParseQualifiers">
 <Final>1</Final>
 <ClassMethod>1</ClassMethod>