diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
index 4e34424eab7..f1c3db7c430 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
@@ -146,6 +146,7 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("configuration.mustache", "", "configuration.go"));
         supportingFiles.add(new SupportingFile("api_client.mustache", "", "api_client.go"));
         supportingFiles.add(new SupportingFile("api_response.mustache", "", "api_response.go"));
+        supportingFiles.add(new SupportingFile(".travis.yml", "", ".travis.yml"));
         supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
     }
 
diff --git a/samples/client/petstore/go/.travis.yml b/modules/swagger-codegen/src/main/resources/go/.travis.yml
similarity index 100%
rename from samples/client/petstore/go/.travis.yml
rename to modules/swagger-codegen/src/main/resources/go/.travis.yml
diff --git a/samples/client/petstore/go/go-petstore/.travis.yml b/samples/client/petstore/go/go-petstore/.travis.yml
new file mode 100644
index 00000000000..1052f0f4e92
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/.travis.yml
@@ -0,0 +1,9 @@
+language: go
+
+install:
+  - go get -d -v .
+
+script:
+  - go build -v ./go-petstore/
+  - go test -v .
+
diff --git a/samples/client/petstore/go/go-petstore/docs/ApiResponse.md b/samples/client/petstore/go/go-petstore/docs/ApiResponse.md
deleted file mode 100644
index 3653b42ba24..00000000000
--- a/samples/client/petstore/go/go-petstore/docs/ApiResponse.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# ApiResponse
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Code** | **int32** |  | [optional] [default to null]
-**Type_** | **string** |  | [optional] [default to null]
-**Message** | **string** |  | [optional] [default to null]
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/client/petstore/go/pom.xml b/samples/client/petstore/go/pom.xml
deleted file mode 100644
index 724ac791dcd..00000000000
--- a/samples/client/petstore/go/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.wordnik</groupId>
-    <artifactId>Goswagger</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0</version>
-    <name>Goswagger</name>
- <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <id>go-get-testify</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>go</executable>
-                            <arguments>
-                                <argument>get</argument>
-                                <argument>github.com/stretchr/testify/assert</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>go-get-resty</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>go</executable>
-                            <arguments>
-                                <argument>get</argument>
-                                <argument>github.com/go-resty/resty</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>go-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>go</executable>
-                            <arguments>
-                                <argument>test</argument>
-                                <argument>-v</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file