diff --git a/pmd-swift/src/main/resources/category/swift/errorprone.xml b/pmd-swift/src/main/resources/category/swift/errorprone.xml
index 288b3ed278..5f471da610 100644
--- a/pmd-swift/src/main/resources/category/swift/errorprone.xml
+++ b/pmd-swift/src/main/resources/category/swift/errorprone.xml
@@ -25,7 +25,7 @@
             <property name="xpath">
                 <value>
                     <![CDATA[
-//TypeCastingOperator[starts-with(@Text,'as!')]
+//TypeCastingOperator[T-bang]
 ]]>
                 </value>
             </property>
@@ -55,7 +55,7 @@ NSNumber() as? Int // no violation
             <property name="xpath">
                 <value>
 <![CDATA[
-//TryOperator[@Text='try!']
+//TryOperator[T-bang]
 ]]>
                 </value>
             </property>
diff --git a/pmd-swift/src/test/resources/net/sourceforge/pmd/lang/swift/rule/errorprone/xml/ForceTry.xml b/pmd-swift/src/test/resources/net/sourceforge/pmd/lang/swift/rule/errorprone/xml/ForceTry.xml
index a283d4b263..1d6e647df5 100644
--- a/pmd-swift/src/test/resources/net/sourceforge/pmd/lang/swift/rule/errorprone/xml/ForceTry.xml
+++ b/pmd-swift/src/test/resources/net/sourceforge/pmd/lang/swift/rule/errorprone/xml/ForceTry.xml
@@ -1,30 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data
-        xmlns="http://pmd.sourceforge.net/rule-tests"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
-    <test-code>
-        <description><![CDATA[
-Good example #1
-     ]]></description>
-        <expected-problems>0</expected-problems>
-        <code><![CDATA[
+<test-data xmlns="http://pmd.sourceforge.net/rule-tests"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
+   <test-code>
+      <description>Good example #1</description>
+      <expected-problems>0</expected-problems>
+      <code><![CDATA[
 func a() throws {}
 do {
   try a()
 } catch {}
-     ]]></code>
-        <source-type>swift</source-type>
-    </test-code>
-    <test-code>
-        <description><![CDATA[
-Bad example #1
-     ]]></description>
-        <expected-problems>1</expected-problems>
-        <code><![CDATA[
+        ]]></code>
+   </test-code>
+
+   <test-code>
+      <description>Bad example #1</description>
+      <expected-problems>1</expected-problems>
+      <code><![CDATA[
 func a() throws {}
 try! a()
-     ]]></code>
-        <source-type>swift</source-type>
-    </test-code>
+        ]]></code>
+   </test-code>
+
 </test-data>
\ No newline at end of file