diff --git a/lib/go/Makefile.am b/lib/go/Makefile.am
index 7c82467..1a83e58 100644
--- a/lib/go/Makefile.am
+++ b/lib/go/Makefile.am
@@ -1,12 +1,35 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
+if WITH_TESTS
+SUBDIRS = test
+endif
+
 install:
 	@echo '##############################################################'
 	@echo '##############################################################'
-	@echo 'The Go client library should be insalled via "go get", please see /lib/go/README'
+	@echo 'The Go client library should be installed via "go get", please see /lib/go/README'
 	@echo '##############################################################'
 	@echo '##############################################################'
 
 check-local:
-	go test ./thrift
+	$(GO) test ./thrift
 
 all-local: check-local
 
diff --git a/lib/go/test/IncludesTest.thrift b/lib/go/test/IncludesTest.thrift
new file mode 100644
index 0000000..4416c09
--- /dev/null
+++ b/lib/go/test/IncludesTest.thrift
@@ -0,0 +1,41 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
+include "ThriftTest.thrift"
+
+struct testStruct {
+  1: list<ThriftTest.Numberz> listNumbers
+}
+
+struct TestStruct2 {
+  1: testStruct blah,
+}
+
+service testService extends ThriftTest.SecondService {
+  ThriftTest.CrazyNesting getCrazyNesting(
+    1: ThriftTest.StructA a,
+    2: ThriftTest.Numberz numbers
+  ) throws(1: ThriftTest.Xception err1),
+
+  void getSomeValue_DO_NOT_CALL(),
+}
+
+service ExtendedService extends testService {
+  void extendedMethod(),
+}