diff --git a/pippo-content-type-parent/pippo-gson/pom.xml b/pippo-content-type-parent/pippo-gson/pom.xml
index 005ff9bc0..684ae0e57 100644
--- a/pippo-content-type-parent/pippo-gson/pom.xml
+++ b/pippo-content-type-parent/pippo-gson/pom.xml
@@ -15,7 +15,7 @@
     <description>Google Gson integration</description>
 
     <properties>
-        <gson.version>2.3.1</gson.version>
+        <gson.version>2.8.6</gson.version>
     </properties>
 
     <dependencies>
@@ -46,4 +46,24 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>false</filtering>
+            </testResource>
+
+            <testResource>
+                <directory>src/test/java</directory>
+                <includes>
+                    <include>**</include>
+                </includes>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+                <filtering>false</filtering>
+            </testResource>
+        </testResources>
+    </build>
+
 </project>
diff --git a/pippo-content-type-parent/pippo-gson/src/main/java/ro/pippo/gson/GsonEngine.java b/pippo-content-type-parent/pippo-gson/src/main/java/ro/pippo/gson/GsonEngine.java
index d5cecac53..1cd734036 100644
--- a/pippo-content-type-parent/pippo-gson/src/main/java/ro/pippo/gson/GsonEngine.java
+++ b/pippo-content-type-parent/pippo-gson/src/main/java/ro/pippo/gson/GsonEngine.java
@@ -17,25 +17,14 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-import com.google.gson.JsonSyntaxException;
+
 import org.kohsuke.MetaInfServices;
 import ro.pippo.core.Application;
 import ro.pippo.core.ContentTypeEngine;
 import ro.pippo.core.HttpConstants;
 
-import java.lang.reflect.Type;
 import java.sql.Time;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Locale;
 
 /**
  * A JsonEngine based on Gson.
@@ -49,11 +38,7 @@ public class GsonEngine implements ContentTypeEngine {
 
     @Override
     public void init(Application application) {
-        this.gson = new GsonBuilder()
-            .registerTypeAdapter(Date.class, new ISO8601DateTimeTypeAdapter())
-            .registerTypeAdapter(Time.class, new ISO8601TimeTypeAdapter())
-            .registerTypeAdapter(java.sql.Date.class, new ISO8601DateTypeAdapter())
-            .create();
+        this.gson = buildGson(application);
     }
 
     @Override
@@ -71,93 +56,12 @@ public <T> T fromString(String content, Class<T> classOfT) {
         return gson.fromJson(content, classOfT);
     }
 
-    public static class ISO8601DateTypeAdapter implements JsonSerializer<java.sql.Date>, JsonDeserializer<java.sql.Date> {
-        private final DateFormat dateFormat;
-
-        public ISO8601DateTypeAdapter() {
-            dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.US);
-        }
-
-        @Override
-        public synchronized JsonElement serialize(java.sql.Date date, Type type,
-                                                  JsonSerializationContext jsonSerializationContext) {
-            synchronized (dateFormat) {
-                String dateFormatAsString = dateFormat.format(date);
-                return new JsonPrimitive(dateFormatAsString);
-            }
-        }
-
-        @Override
-        public synchronized java.sql.Date deserialize(JsonElement jsonElement, Type type,
-                                                      JsonDeserializationContext jsonDeserializationContext) {
-            try {
-                synchronized (dateFormat) {
-                    Date date = dateFormat.parse(jsonElement.getAsString());
-                    return new java.sql.Date((date.getTime() / 1000) * 1000);
-                }
-            } catch (ParseException e) {
-                throw new JsonSyntaxException(jsonElement.getAsString(), e);
-            }
-        }
-    }
-
-    public static class ISO8601TimeTypeAdapter implements JsonSerializer<Time>, JsonDeserializer<Time> {
-        private final DateFormat timeFormat;
-
-        public ISO8601TimeTypeAdapter() {
-            timeFormat = new SimpleDateFormat("HH:mm:ssZ", Locale.US);
-        }
-
-        @Override
-        public synchronized JsonElement serialize(Time time, Type type,
-                                                  JsonSerializationContext jsonSerializationContext) {
-            synchronized (timeFormat) {
-                String timeFormatAsString = timeFormat.format(time);
-                return new JsonPrimitive(timeFormatAsString);
-            }
-        }
-
-        @Override
-        public synchronized Time deserialize(JsonElement jsonElement, Type type,
-                                             JsonDeserializationContext jsonDeserializationContext) {
-            try {
-                synchronized (timeFormat) {
-                    Date date = timeFormat.parse(jsonElement.getAsString());
-                    return new Time((date.getTime() / 1000) * 1000);
-                }
-            } catch (ParseException e) {
-                throw new JsonSyntaxException(jsonElement.getAsString(), e);
-            }
-        }
+    protected Gson buildGson(Application application) {
+        return new GsonBuilder()
+            .registerTypeAdapter(Date.class, new ISO8601DateTimeTypeAdapter())
+            .registerTypeAdapter(Time.class, new ISO8601TimeTypeAdapter())
+            .registerTypeAdapter(java.sql.Date.class, new ISO8601DateTypeAdapter())
+            .create();
     }
 
-    public static class ISO8601DateTimeTypeAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
-        private final DateFormat dateTimeFormat;
-
-        public ISO8601DateTimeTypeAdapter() {
-            dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US);
-        }
-
-        @Override
-        public synchronized JsonElement serialize(Date date, Type type,
-                                                  JsonSerializationContext jsonSerializationContext) {
-            synchronized (dateTimeFormat) {
-                String dateFormatAsString = dateTimeFormat.format(date);
-                return new JsonPrimitive(dateFormatAsString);
-            }
-        }
-
-        @Override
-        public synchronized Date deserialize(JsonElement jsonElement, Type type,
-                                             JsonDeserializationContext jsonDeserializationContext) {
-            try {
-                synchronized (dateTimeFormat) {
-                    Date date = dateTimeFormat.parse(jsonElement.getAsString());
-                    return new Date((date.getTime() / 1000) * 1000);
-                }
-            } catch (ParseException e) {
-                throw new JsonSyntaxException(jsonElement.getAsString(), e);
-            }
-        }
-    }
 }
diff --git a/pippo-content-type-parent/pippo-gson/src/main/java/ro/pippo/gson/ISO8601DateTimeTypeAdapter.java b/pippo-content-type-parent/pippo-gson/src/main/java/ro/pippo/gson/ISO8601DateTimeTypeAdapter.java
new file mode 100644
index 000000000..517080fdd
--- /dev/null
+++ b/pippo-content-type-parent/pippo-gson/src/main/java/ro/pippo/gson/ISO8601DateTimeTypeAdapter.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ro.pippo.gson;
+
+import java.lang.reflect.Type;
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.util.Date;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.internal.bind.util.ISO8601Utils;
+
+public class ISO8601DateTimeTypeAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
+
+    public ISO8601DateTimeTypeAdapter() {
+    }
+
+    @Override
+    public synchronized JsonElement serialize(Date date, Type type,
+                                              JsonSerializationContext jsonSerializationContext) {
+        String dateFormatAsString = ISO8601Utils.format(date);
+        return new JsonPrimitive(dateFormatAsString);
+    }
+
+    @Override
+    public synchronized Date deserialize(JsonElement jsonElement, Type type,
+                                         JsonDeserializationContext jsonDeserializationContext) {
+        try {
+            return ISO8601Utils.parse(jsonElement.getAsString(), new ParsePosition(0));
+        } catch (ParseException e) {
+            throw new JsonSyntaxException(jsonElement.getAsString(), e);
+        }
+    }
+
+}
diff --git a/pippo-content-type-parent/pippo-gson/src/main/java/ro/pippo/gson/ISO8601DateTypeAdapter.java b/pippo-content-type-parent/pippo-gson/src/main/java/ro/pippo/gson/ISO8601DateTypeAdapter.java
new file mode 100644
index 000000000..ee49aa3e3
--- /dev/null
+++ b/pippo-content-type-parent/pippo-gson/src/main/java/ro/pippo/gson/ISO8601DateTypeAdapter.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ro.pippo.gson;
+
+import java.lang.reflect.Type;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.JsonSyntaxException;
+
+public class ISO8601DateTypeAdapter implements JsonSerializer<java.sql.Date>, JsonDeserializer<java.sql.Date> {
+
+    private final DateFormat dateFormat;
+
+    public ISO8601DateTypeAdapter() {
+        dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.US);
+    }
+
+    @Override
+    public synchronized JsonElement serialize(java.sql.Date date, Type type,
+                                              JsonSerializationContext jsonSerializationContext) {
+        synchronized (dateFormat) {
+            String dateFormatAsString = dateFormat.format(date);
+            return new JsonPrimitive(dateFormatAsString);
+        }
+    }
+
+    @Override
+    public synchronized java.sql.Date deserialize(JsonElement jsonElement, Type type,
+                                                  JsonDeserializationContext jsonDeserializationContext) {
+        try {
+            synchronized (dateFormat) {
+                Date date = dateFormat.parse(jsonElement.getAsString());
+                return new java.sql.Date(date.getTime());
+            }
+        } catch (ParseException e) {
+            throw new JsonSyntaxException(jsonElement.getAsString(), e);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/pippo-content-type-parent/pippo-gson/src/main/java/ro/pippo/gson/ISO8601TimeTypeAdapter.java b/pippo-content-type-parent/pippo-gson/src/main/java/ro/pippo/gson/ISO8601TimeTypeAdapter.java
new file mode 100644
index 000000000..4261a5bf6
--- /dev/null
+++ b/pippo-content-type-parent/pippo-gson/src/main/java/ro/pippo/gson/ISO8601TimeTypeAdapter.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ro.pippo.gson;
+
+import java.lang.reflect.Type;
+import java.sql.Time;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.JsonSyntaxException;
+
+public class ISO8601TimeTypeAdapter implements JsonSerializer<Time>, JsonDeserializer<Time> {
+
+    private final DateFormat timeFormat;
+
+    public ISO8601TimeTypeAdapter() {
+        timeFormat = new SimpleDateFormat("HH:mm:ssZ", Locale.US);
+    }
+
+    @Override
+    public synchronized JsonElement serialize(Time time, Type type,
+                                              JsonSerializationContext jsonSerializationContext) {
+        synchronized (timeFormat) {
+            String timeFormatAsString = timeFormat.format(time);
+            return new JsonPrimitive(timeFormatAsString);
+        }
+    }
+
+    @Override
+    public synchronized Time deserialize(JsonElement jsonElement, Type type,
+                                         JsonDeserializationContext jsonDeserializationContext) {
+        try {
+            synchronized (timeFormat) {
+                Date date = timeFormat.parse(jsonElement.getAsString());
+                return new Time(date.getTime());
+            }
+        } catch (ParseException e) {
+            throw new JsonSyntaxException(jsonElement.getAsString(), e);
+        }
+    }
+
+}
diff --git a/pippo-content-type-parent/pippo-gson/src/main/test/ro/pippo/gson/GsonEngineTest.java b/pippo-content-type-parent/pippo-gson/src/main/test/ro/pippo/gson/GsonEngineTest.java
deleted file mode 100644
index 60a491fb8..000000000
--- a/pippo-content-type-parent/pippo-gson/src/main/test/ro/pippo/gson/GsonEngineTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package ro.pippo.gson;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * @author James Moger
- */
-public class GsonEngineTest extends Assert {
-
-    @Test
-    public void testEngine() {
-        MyTest test = new MyTest();
-
-        GsonEngine engine = new GsonEngine();
-        String json = engine.toString(test);
-
-        MyTest result = engine.fromString(json, MyTest.class);
-        assertEquals(test.message, result.message);
-    }
-
-    @Test
-    public void testDates() {
-        Calendar cal = Calendar.getInstance();
-        cal.set(Calendar.MILLISECOND, 0);
-        Date now = cal.getTime();
-
-        MyTest test = new MyTest();
-        test.date = now;
-
-        GsonEngine engine = new GsonEngine();
-        String json = engine.toString(test);
-
-        MyTest result = engine.fromString(json, MyTest.class);
-        assertEquals(test.message, result.message);
-
-        assertTrue(test.date.equals(result.date));
-    }
-
-    public static class MyTest {
-
-        public String message = "Hooray!";
-
-        public Date date = new Date();
-
-    }
-}
diff --git a/pippo-content-type-parent/pippo-gson/src/test/java/ro/pippo/gson/GsonEngineTest.java b/pippo-content-type-parent/pippo-gson/src/test/java/ro/pippo/gson/GsonEngineTest.java
new file mode 100644
index 000000000..4b6a9aca9
--- /dev/null
+++ b/pippo-content-type-parent/pippo-gson/src/test/java/ro/pippo/gson/GsonEngineTest.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ro.pippo.gson;
+
+import java.sql.Time;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author James Moger
+ * @author Dwouglas Mhagnum
+ */
+public class GsonEngineTest extends Assert {
+
+    GsonEngine engine;
+
+    @Before
+    public void setUp() {
+        engine = new GsonEngine();
+        engine.init(null);
+
+        // This test runs in Australia's time zone = GMT+10 (arbitrary)
+        TimeZone.setDefault(TimeZone.getTimeZone("Australia/Sydney"));
+    }
+
+    @Test
+    public void testEngine() {
+        MyTest test = new MyTest();
+
+        String json = engine.toString(test);
+
+        MyTest result = engine.fromString(json, MyTest.class);
+        assertEquals(test.message, result.message);
+    }
+
+    @Test
+    public void testDates() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.MILLISECOND, 0);
+        Date now = cal.getTime();
+
+        MyTest test = new MyTest();
+        test.date = now;
+
+        String json = engine.toString(test);
+
+        MyTest result = engine.fromString(json, MyTest.class);
+        assertEquals(test.message, result.message);
+
+        assertTrue(test.date.equals(result.date));
+    }
+
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testDates_ISO8601Time() {
+        // Given
+        String messageExpected = "Hello!";
+        String json = MyTest.jsonForTime(messageExpected, "21:33:44-0700");
+
+        // When
+        MyTest result = engine.fromString(json, MyTest.class);
+
+        // Then
+        assertEquals(messageExpected, result.message);
+        // 14:33:44 will be the time from 21:33:44 GMT-7 to GMT+10 (see @Before)
+        assertEquals(14, result.time.getHours());
+        assertEquals(33, result.time.getMinutes());
+        assertEquals(44, result.time.getSeconds());
+    }
+
+    @Test
+    public void testDates_ISO8601DateTime_v1() {
+        // Given
+        String messageExpected = "Hello!";
+
+        ZonedDateTime zonedDateTime = ZonedDateTime.of(2019, 12, 28, 8, 53, 38, 0, ZoneId.of("UTC-3"));
+        Date dateExpected = toDate(zonedDateTime);
+
+        String json = MyTest.jsonForDate(messageExpected, "2019-12-28T08:53:38-0300");
+
+        // When
+        MyTest result = engine.fromString(json, MyTest.class);
+
+        // Then
+        assertEquals(messageExpected, result.message);
+        assertTrue(dateExpected.equals(result.date));
+    }
+
+    @Test
+    public void testDates_ISO8601DateTime_v2() {
+        // Given
+        String messageExpected = "Hello!";
+
+        ZonedDateTime zonedDateTime = ZonedDateTime.of(2019, 12, 27, 20, 00, 00, 0, ZoneId.of("UTC-0"));
+        Date dateExpected = toDate(zonedDateTime);
+
+        String json = MyTest.jsonForDate(messageExpected, "2019-12-27T20:00:00.000Z");
+
+        // When
+        MyTest result = engine.fromString(json, MyTest.class);
+
+        // Then
+        assertEquals(messageExpected, result.message);
+        assertTrue(dateExpected.equals(result.date));
+    }
+
+    public static class MyTest {
+
+
+        public String message = "Hooray!";
+
+        public Date date = new Date();
+
+        public Time time;
+
+        static String jsonForDate(String message, String date) {
+            final String TEMPLATE = "{\"message\":\":message\",\"date\":\":date\"}";
+            return TEMPLATE.replace(":message", message).replace(":date", date);
+        }
+
+        static String jsonForTime(String message, String time) {
+            final String TEMPLATE = "{\"message\":\":message\",\"time\":\":time\"}";
+            return TEMPLATE.replace(":message", message).replace(":time", time);
+        }
+
+    }
+
+    private Date toDate(ZonedDateTime zdt) {
+        Instant instant = zdt.toInstant();
+        Instant instantTruncatedToMilliseconds = Instant.ofEpochMilli( instant.toEpochMilli() );
+        return Date.from( instantTruncatedToMilliseconds );
+    }
+
+}