diff --git a/jdbc/jooq/src/main/java/example/springdata/jdbc/jooq/Category.java b/jdbc/jooq/src/main/java/example/springdata/jdbc/jooq/Category.java
index 0782cfd3..f7c9ba13 100644
--- a/jdbc/jooq/src/main/java/example/springdata/jdbc/jooq/Category.java
+++ b/jdbc/jooq/src/main/java/example/springdata/jdbc/jooq/Category.java
@@ -17,6 +17,7 @@ package example.springdata.jdbc.jooq;
 
 import lombok.Data;
 
+import lombok.experimental.Wither;
 import org.springframework.data.annotation.Id;
 
 /**
@@ -28,6 +29,7 @@ import org.springframework.data.annotation.Id;
 @Data
 public class Category {
 
+	@Wither
 	private final @Id Long id;
 	private String name, description;
 	private AgeGroup ageGroup;
diff --git a/jdbc/jooq/src/test/java/example/springdata/jdbc/jooq/SimpleEntityTests.java b/jdbc/jooq/src/test/java/example/springdata/jdbc/jooq/SimpleEntityTests.java
index 450a8695..87f711a9 100644
--- a/jdbc/jooq/src/test/java/example/springdata/jdbc/jooq/SimpleEntityTests.java
+++ b/jdbc/jooq/src/test/java/example/springdata/jdbc/jooq/SimpleEntityTests.java
@@ -51,11 +51,10 @@ public class SimpleEntityTests {
 		Category buildings = new Category(null, "Buildings", null, AgeGroup._12andOlder);
 
 		// save categories
-		repository.saveAll(asList(cars, buildings));
+		Iterable<Category> saved = repository.saveAll(asList(cars, buildings));
 		Output.list(repository.findAll(), "`Cars` and `Buildings` got saved");
 
-		assertThat(cars.getId()).isNotNull();
-		assertThat(buildings.getId()).isNotNull();
+		assertThat(saved).extracting(c -> c.getId()).isNotNull();
 
 		// update one
 		buildings.setDescription("Famous and impressive buildings incl. the 'bike shed'.");