diff --git a/.travis.yml b/.travis.yml
index 123e520bddc..c590f2a0090 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,9 @@ before_install:
   - cat /etc/hosts
 
 install:
+  # Add Godeps dependencies to GOPATH and PATH
+   - export GOPATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace"
+   - export PATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace/bin:$PATH"
 
 script:
   - mvn verify -Psamples
diff --git a/pom.xml b/pom.xml
index f58b4ca35f6..22c62aeadc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -544,6 +544,18 @@
                 <module>samples/client/petstore/ruby</module>
             </modules>
         </profile>
+        <profile>
+            <id>go-client</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/go</module>
+            </modules>
+        </profile>
         <profile>
             <id>spring-mvc</id>
             <activation>
@@ -603,33 +615,36 @@
             <modules>
                 <!-- run ruby test first which has a random delay script to
                      avoid issues with running 2 CI jobs in parallel.       -->
+                <!-- clients -->
                 <module>samples/client/petstore/ruby</module>
-                <module>samples/client/petstore/python</module>
-                <module>samples/client/petstore/typescript-fetch/tests/default</module>
-                <module>samples/client/petstore/typescript-fetch/builds/default</module>
-                <module>samples/client/petstore/typescript-fetch/builds/es6-target</module>
-                <module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>
-                <module>samples/client/petstore/typescript-angular</module>
-                <module>samples/client/petstore/typescript-node/npm</module>
                 <module>samples/client/petstore/android/volley</module>
                 <module>samples/client/petstore/clojure</module>
-                <module>samples/client/petstore/java/jersey1</module>
+                <module>samples/client/petstore/go</module>
                 <module>samples/client/petstore/java/feign</module>
+                <module>samples/client/petstore/java/jersey1</module>
                 <module>samples/client/petstore/java/jersey2</module>
                 <module>samples/client/petstore/java/okhttp-gson</module>
                 <module>samples/client/petstore/java/retrofit</module>
                 <module>samples/client/petstore/java/retrofit2</module>
                 <module>samples/client/petstore/java/retrofit2rx</module>
                 <module>samples/client/petstore/javascript</module>
+                <module>samples/client/petstore/python</module>
                 <module>samples/client/petstore/scala</module>
-                <module>samples/server/petstore/spring-mvc</module>
-                <module>samples/server/petstore/springboot</module>
-                <module>samples/client/petstore/spring-cloud</module>
+                <module>samples/client/petstore/typescript-fetch/builds/default</module>
+                <module>samples/client/petstore/typescript-fetch/builds/es6-target</module>
+                <module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>
+                <module>samples/client/petstore/typescript-fetch/tests/default</module>
+                <module>samples/client/petstore/typescript-angular</module>
+                <module>samples/client/petstore/typescript-node/npm</module>
+                <!-- servers -->
                 <module>samples/server/petstore/jaxrs/jersey1</module>
                 <module>samples/server/petstore/jaxrs/jersey2</module>
                 <module>samples/server/petstore/jaxrs-resteasy/default</module>
                 <module>samples/server/petstore/jaxrs-resteasy/joda</module>
                 <module>samples/server/petstore/scalatra</module>
+                <module>samples/server/petstore/spring-mvc</module>
+                <module>samples/client/petstore/spring-cloud</module>
+                <module>samples/server/petstore/springboot</module>
                 <!--module>samples/client/petstore/objc/SwaggerClientTests</module-->
                 <!--module>samples/client/petstore/swift/SwaggerClientTests</module-->
             </modules>
diff --git a/samples/client/petstore/go/go-petstore/README.md b/samples/client/petstore/go/go-petstore/README.md
index dd7d1da39ed..b5fe36b2cb3 100644
--- a/samples/client/petstore/go/go-petstore/README.md
+++ b/samples/client/petstore/go/go-petstore/README.md
@@ -7,7 +7,7 @@ This API client was generated by the [swagger-codegen](https://github.com/swagge
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-07-26T22:50:03.821+08:00
+- Build date: 2016-07-27T14:47:08.029+08:00
 - Build package: class io.swagger.codegen.languages.GoClientCodegen
 
 ## Installation
diff --git a/samples/client/petstore/go/go-petstore/pom.xml b/samples/client/petstore/go/go-petstore/pom.xml
index ab57225649c..7680ed95cff 100644
--- a/samples/client/petstore/go/go-petstore/pom.xml
+++ b/samples/client/petstore/go/go-petstore/pom.xml
@@ -41,7 +41,7 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>go-get-resty</id>
+                        <id>go-get-sling</id>
                         <phase>pre-integration-test</phase>
                         <goals>
                             <goal>exec</goal>
@@ -50,7 +50,7 @@
                             <executable>go</executable>
                             <arguments>
                                 <argument>get</argument>
-                                <argument>github.com/go-resty/resty</argument>
+                                <argument>github.com/dghubble/sling</argument>
                             </arguments>
                         </configuration>
                     </execution>
@@ -72,4 +72,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/samples/client/petstore/go/pom.xml b/samples/client/petstore/go/pom.xml
index 7ecbbc7e198..028ef60a6f4 100644
--- a/samples/client/petstore/go/pom.xml
+++ b/samples/client/petstore/go/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>Goswagger</artifactId>
     <packaging>pom</packaging>
     <version>1.0.0</version>
-    <name>Goswagger</name>
+    <name>Go Petstore Client</name>
  <build>
         <plugins>
             <plugin>