diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java
index 7e3fd23644..195e5c1e86 100644
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -35,9 +35,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithArray() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -48,9 +48,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithList() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
 
diff --git a/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/UserApiTest.java
index d5d10b39d7..de3cd73dd9 100644
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -34,9 +34,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithArray() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -47,9 +47,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithList() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
 
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java
index 7e3fd23644..195e5c1e86 100644
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -35,9 +35,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithArray() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -48,9 +48,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithList() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java
index 7e3fd23644..195e5c1e86 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -35,9 +35,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithArray() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -48,9 +48,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithList() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
 
diff --git a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java
index 97ef057e37..9b949445cc 100644
--- a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -33,9 +33,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithArray() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -46,9 +46,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithList() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
 
diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/UserApiTest.java
index fbcdc483da..6c35c94383 100644
--- a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -33,9 +33,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithArray() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2})).execute();
 
@@ -46,9 +46,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithList() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2})).execute();