diff --git a/betterproto/tests/inputs/config.py b/betterproto/tests/inputs/config.py
index 1f276ba..7ed40f5 100644
--- a/betterproto/tests/inputs/config.py
+++ b/betterproto/tests/inputs/config.py
@@ -12,6 +12,8 @@ tests = {
     "casing_message_field_uppercase",  # 11
     "namespace_keywords",  # 70
     "namespace_builtin_types",  # 53
+    "googletypes_struct",  # 9
+    "googletypes_value",  # 9
 }
 
 services = {
diff --git a/betterproto/tests/inputs/googletypes_struct/googletypes_struct.json b/betterproto/tests/inputs/googletypes_struct/googletypes_struct.json
new file mode 100644
index 0000000..ecc175e
--- /dev/null
+++ b/betterproto/tests/inputs/googletypes_struct/googletypes_struct.json
@@ -0,0 +1,5 @@
+{
+  "struct": {
+    "key": true
+  }
+}
diff --git a/betterproto/tests/inputs/googletypes_struct/googletypes_struct.proto b/betterproto/tests/inputs/googletypes_struct/googletypes_struct.proto
new file mode 100644
index 0000000..1dbd64a
--- /dev/null
+++ b/betterproto/tests/inputs/googletypes_struct/googletypes_struct.proto
@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+import "google/protobuf/struct.proto";
+
+message Test {
+  google.protobuf.Struct struct = 1;
+}
diff --git a/betterproto/tests/inputs/googletypes_value/googletypes_value.json b/betterproto/tests/inputs/googletypes_value/googletypes_value.json
new file mode 100644
index 0000000..db52d5c
--- /dev/null
+++ b/betterproto/tests/inputs/googletypes_value/googletypes_value.json
@@ -0,0 +1,11 @@
+{
+  "value1": "hello world",
+  "value2": true,
+  "value3": 1,
+  "value4": null,
+  "value5": [
+    1,
+    2,
+    3
+  ]
+}
diff --git a/betterproto/tests/inputs/googletypes_value/googletypes_value.proto b/betterproto/tests/inputs/googletypes_value/googletypes_value.proto
new file mode 100644
index 0000000..379d336
--- /dev/null
+++ b/betterproto/tests/inputs/googletypes_value/googletypes_value.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+import "google/protobuf/struct.proto";
+
+// Tests that fields of type google.protobuf.Value can contain arbitrary JSON-values.
+
+message Test {
+  google.protobuf.Value value1 = 1;
+  google.protobuf.Value value2 = 2;
+  google.protobuf.Value value3 = 3;
+  google.protobuf.Value value4 = 4;
+  google.protobuf.Value value5 = 5;
+}