diff --git a/pom.xml b/pom.xml
index 5f90fc6..86f76eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<drivers.dir>${project.basedir}/drivers</drivers.dir>
 		<jetty.version>11.0.26</jetty.version>
-		<flowingcode.commons.demo.version>5.0.0</flowingcode.commons.demo.version>
+		<flowingcode.commons.demo.version>5.1.0</flowingcode.commons.demo.version>
 		<frontend.hotdeploy>true</frontend.hotdeploy>
 	</properties>
 
diff --git a/src/test/java/com/flowingcode/vaadin/addons/badgelist/StyledBadgesDemo.java b/src/test/java/com/flowingcode/vaadin/addons/badgelist/StyledBadgesDemo.java
index 6ceffb2..0d33104 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/badgelist/StyledBadgesDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/badgelist/StyledBadgesDemo.java
@@ -34,11 +34,11 @@
 @DemoSource
 //#if vaadin eq 0
 @DemoSource(value = "/src/test/resources/META-INF/frontend/styles/styled-badges-demo.css",
-    caption = "styled-badges-demo.css")
+    caption = "styled-badges-demo.css", condition = "vaadin eq 24")
 @DemoSource(value = "/src/test/resources/META-INF/frontend/styles/styled-badges-demo-v25.css",
-    caption = "styled-badges-demo-v25.css")
+    caption = "styled-badges-demo.css", condition = "vaadin ge 25")
 @DemoSource(value = "/src/test/resources/META-INF/frontend/styles/fc-badge-list.css",
-    caption = "fc-badge-list.css")
+    caption = "fc-badge-list.css", condition = "vaadin ge 25")
 //#endif
 @PageTitle("Styled Badges Demo")
 @SuppressWarnings("serial")