diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am
index e03d48b..bbcec96 100644
--- a/lib/go/test/Makefile.am
+++ b/lib/go/test/Makefile.am
@@ -32,6 +32,7 @@
 				GoTagTest.thrift \
 				TypedefFieldTest.thrift \
 				RefAnnotationFieldsTest.thrift \
+				UnionDefaultValueTest.thrift \
 				ErrorTest.thrift \
 				NamesTest.thrift \
 				InitialismsTest.thrift \
@@ -49,6 +50,7 @@
 	$(THRIFT) $(THRIFTARGS) GoTagTest.thrift
 	$(THRIFT) $(THRIFTARGS) TypedefFieldTest.thrift
 	$(THRIFT) $(THRIFTARGS) RefAnnotationFieldsTest.thrift
+	$(THRIFT) $(THRIFTARGS) UnionDefaultValueTest.thrift
 	$(THRIFT) $(THRIFTARGS) ErrorTest.thrift
 	$(THRIFT) $(THRIFTARGS) NamesTest.thrift
 	$(THRIFT) $(THRIFTARGS) InitialismsTest.thrift
@@ -91,6 +93,7 @@
 	OnewayTest.thrift \
 	OptionalFieldsTest.thrift \
 	RefAnnotationFieldsTest.thrift \
+	UnionDefaultValueTest.thrift \
 	ServicesTest.thrift \
 	TypedefFieldTest.thrift \
 	ErrorTest.thrift \
diff --git a/lib/go/test/UnionDefaultValueTest.thrift b/lib/go/test/UnionDefaultValueTest.thrift
new file mode 100644
index 0000000..4c93480
--- /dev/null
+++ b/lib/go/test/UnionDefaultValueTest.thrift
@@ -0,0 +1,34 @@
+#
+# 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.
+#
+
+struct Option1 {
+}
+
+struct Option2 {
+  1: optional string name
+}
+
+union Descendant {
+  1: Option1 option1
+  2: Option2 option2
+}
+
+struct TestStruct {
+  1: optional Descendant descendant = { "option1": {}}
+}
diff --git a/lib/go/test/tests/union_default_value_test.go b/lib/go/test/tests/union_default_value_test.go
new file mode 100644
index 0000000..2dcbf4e
--- /dev/null
+++ b/lib/go/test/tests/union_default_value_test.go
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+package tests
+
+import (
+	"testing"
+	"uniondefaultvaluetest"
+)
+
+func TestUnionDefaultValue(t *testing.T) {
+	s := uniondefaultvaluetest.NewTestStruct()
+	d := s.GetDescendant()
+	if d == nil {
+		t.Error("Default Union value not set!")
+	}
+}