diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index a1fd7e345a8..6094f2242e1 100644
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -8,6 +8,7 @@ import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
 
 import java.util.Map;
+import java.text.SimpleDateFormat;
 
 import org.junit.*;
 import static org.junit.Assert.*;
@@ -21,6 +22,8 @@ public class StoreApiTest {
         // setup authentication
         ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
         apiKeyAuth.setApiKey("special-key");
+        // set custom date format that is used by the petstore server
+        api.getApiClient().setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"));
     }
 
     @Test
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index a1fd7e345a8..6094f2242e1 100644
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -8,6 +8,7 @@ import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
 
 import java.util.Map;
+import java.text.SimpleDateFormat;
 
 import org.junit.*;
 import static org.junit.Assert.*;
@@ -21,6 +22,8 @@ public class StoreApiTest {
         // setup authentication
         ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
         apiKeyAuth.setApiKey("special-key");
+        // set custom date format that is used by the petstore server
+        api.getApiClient().setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"));
     }
 
     @Test
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index a1fd7e345a8..9335c0e6ce6 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -8,6 +8,7 @@ import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
 
 import java.util.Map;
+import java.text.SimpleDateFormat;
 
 import org.junit.*;
 import static org.junit.Assert.*;
@@ -21,6 +22,10 @@ public class StoreApiTest {
         // setup authentication
         ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
         apiKeyAuth.setApiKey("special-key");
+        // set custom date format that is used by the petstore server
+        // Note: it would still work without this setting as okhttp-gson Java client supports
+        // various date formats by default, including the one used by petstore server
+        api.getApiClient().setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"));
     }
 
     @Test