diff --git a/core/src/build/conf/findbugs-exclude.xml b/core/src/build/conf/findbugs-exclude.xml
index 7062b4b..bd6dba0 100644
--- a/core/src/build/conf/findbugs-exclude.xml
+++ b/core/src/build/conf/findbugs-exclude.xml
@@ -1,11 +1,11 @@
 <FindBugsFilter>
-	<!-- filter out test classes with medium (2) or low (3) warnings -->
+	<Match>
+		<Class name="~.*Test" />
+	</Match>
 	<Match>
 		<Or>
-			<Class name="~.*Test" />
-		</Or>
-		<Or>
-			<Class name="*.examples.*" />
+			<Package name="~.*\.examples" />
+			<Package name="~.*\.tutorial" />
 		</Or>
 	</Match>
 </FindBugsFilter>
\ No newline at end of file
diff --git a/examples/src/build/conf/findbugs-exclude.xml b/examples/src/build/conf/findbugs-exclude.xml
index 7062b4b..bd6dba0 100644
--- a/examples/src/build/conf/findbugs-exclude.xml
+++ b/examples/src/build/conf/findbugs-exclude.xml
@@ -1,11 +1,11 @@
 <FindBugsFilter>
-	<!-- filter out test classes with medium (2) or low (3) warnings -->
+	<Match>
+		<Class name="~.*Test" />
+	</Match>
 	<Match>
 		<Or>
-			<Class name="~.*Test" />
-		</Or>
-		<Or>
-			<Class name="*.examples.*" />
+			<Package name="~.*\.examples" />
+			<Package name="~.*\.tutorial" />
 		</Or>
 	</Match>
 </FindBugsFilter>
\ No newline at end of file
diff --git a/extras/src/build/conf/findbugs-exclude.xml b/extras/src/build/conf/findbugs-exclude.xml
index 7062b4b..bd6dba0 100644
--- a/extras/src/build/conf/findbugs-exclude.xml
+++ b/extras/src/build/conf/findbugs-exclude.xml
@@ -1,11 +1,11 @@
 <FindBugsFilter>
-	<!-- filter out test classes with medium (2) or low (3) warnings -->
+	<Match>
+		<Class name="~.*Test" />
+	</Match>
 	<Match>
 		<Or>
-			<Class name="~.*Test" />
-		</Or>
-		<Or>
-			<Class name="*.examples.*" />
+			<Package name="~.*\.examples" />
+			<Package name="~.*\.tutorial" />
 		</Or>
 	</Match>
 </FindBugsFilter>
\ No newline at end of file
diff --git a/swt/src/build/conf/findbugs-exclude.xml b/swt/src/build/conf/findbugs-exclude.xml
index 7062b4b..bd6dba0 100644
--- a/swt/src/build/conf/findbugs-exclude.xml
+++ b/swt/src/build/conf/findbugs-exclude.xml
@@ -1,11 +1,11 @@
 <FindBugsFilter>
-	<!-- filter out test classes with medium (2) or low (3) warnings -->
+	<Match>
+		<Class name="~.*Test" />
+	</Match>
 	<Match>
 		<Or>
-			<Class name="~.*Test" />
-		</Or>
-		<Or>
-			<Class name="*.examples.*" />
+			<Package name="~.*\.examples" />
+			<Package name="~.*\.tutorial" />
 		</Or>
 	</Match>
 </FindBugsFilter>
\ No newline at end of file