diff --git a/back_end/cpp/testcode/alignments_test.cc b/back_end/cpp/testcode/alignments_test.cc
index 9d1414b..0c5eef2 100644
--- a/back_end/cpp/testcode/alignments_test.cc
+++ b/back_end/cpp/testcode/alignments_test.cc
@@ -14,11 +14,11 @@
 
 // Tests that generated code properly preserves and propagates alignment
 // information.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "public/emboss_cpp_util.h"
 #include "testdata/alignments.emb.h"
 
diff --git a/back_end/cpp/testcode/anonymous_bits_test.cc b/back_end/cpp/testcode/anonymous_bits_test.cc
index f7d1aab..8890a0c 100644
--- a/back_end/cpp/testcode/anonymous_bits_test.cc
+++ b/back_end/cpp/testcode/anonymous_bits_test.cc
@@ -14,11 +14,11 @@
 
 // Tests for generated code for anonymous "bits" types, using
 // anonymous_bits.emb.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "public/emboss_cpp_util.h"
 #include "testdata/anonymous_bits.emb.h"
 
diff --git a/back_end/cpp/testcode/auto_array_size_test.cc b/back_end/cpp/testcode/auto_array_size_test.cc
index c689afb..56c9610 100644
--- a/back_end/cpp/testcode/auto_array_size_test.cc
+++ b/back_end/cpp/testcode/auto_array_size_test.cc
@@ -14,14 +14,14 @@
 
 // Tests for automatically-sized arrays from auto_array_size.emb.
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <iterator>
 #include <random>
 #include <vector>
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "public/emboss_text_util.h"
 #include "testdata/auto_array_size.emb.h"
 
diff --git a/back_end/cpp/testcode/bcd_test.cc b/back_end/cpp/testcode/bcd_test.cc
index d545436..da51e8e 100644
--- a/back_end/cpp/testcode/bcd_test.cc
+++ b/back_end/cpp/testcode/bcd_test.cc
@@ -15,13 +15,13 @@
 // Tests for the generated View class from bcd.emb.
 //
 // These tests check that Binary-Coded Decimal (BCD) numbers work.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <array>
 #include <string>
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/bcd.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/bits_test.cc b/back_end/cpp/testcode/bits_test.cc
index 13e1180..8d2b102 100644
--- a/back_end/cpp/testcode/bits_test.cc
+++ b/back_end/cpp/testcode/bits_test.cc
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 // Tests for generated code for "bits" types, using bits.emb.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "public/emboss_cpp_util.h"
 #include "testdata/bits.emb.h"
 
diff --git a/back_end/cpp/testcode/complex_structure_test.cc b/back_end/cpp/testcode/complex_structure_test.cc
index 20494f8..c1e3e38 100644
--- a/back_end/cpp/testcode/complex_structure_test.cc
+++ b/back_end/cpp/testcode/complex_structure_test.cc
@@ -13,13 +13,13 @@
 // limitations under the License.
 
 // Tests of generated code for text format.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <type_traits>
 #include <utility>
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/complex_structure.emb.h"
 
 namespace emboss_test {
diff --git a/back_end/cpp/testcode/condition_test.cc b/back_end/cpp/testcode/condition_test.cc
index 8b88f23..2615dc3 100644
--- a/back_end/cpp/testcode/condition_test.cc
+++ b/back_end/cpp/testcode/condition_test.cc
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 // Tests to ensure that conditional fields work.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/condition.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/dynamic_size_test.cc b/back_end/cpp/testcode/dynamic_size_test.cc
index 003f298..7147212 100644
--- a/back_end/cpp/testcode/dynamic_size_test.cc
+++ b/back_end/cpp/testcode/dynamic_size_test.cc
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 // Tests for fields and structs with dynamic sizes.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/dynamic_size.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/enum_test.cc b/back_end/cpp/testcode/enum_test.cc
index a5a5e14..7b5ca4d 100644
--- a/back_end/cpp/testcode/enum_test.cc
+++ b/back_end/cpp/testcode/enum_test.cc
@@ -16,8 +16,6 @@
 // nested_structure.emb.
 //
 // These tests check that nested structures work.
-#include <gtest/gtest.h>
-
 #include <array>
 #include <cstdint>
 #include <sstream>
@@ -25,6 +23,7 @@
 #include <type_traits>
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/enum.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/explicit_sizes_test.cc b/back_end/cpp/testcode/explicit_sizes_test.cc
index 847c275..452720c 100644
--- a/back_end/cpp/testcode/explicit_sizes_test.cc
+++ b/back_end/cpp/testcode/explicit_sizes_test.cc
@@ -16,11 +16,11 @@
 // nested_structure.emb.
 //
 // These tests check that nested structures work.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/explicit_sizes.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/float_test.cc b/back_end/cpp/testcode/float_test.cc
index e25b982..0570953 100644
--- a/back_end/cpp/testcode/float_test.cc
+++ b/back_end/cpp/testcode/float_test.cc
@@ -14,12 +14,12 @@
 
 // Tests for Emboss floating-point support.
 
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <cmath>
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/float.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/importer_test.cc b/back_end/cpp/testcode/importer_test.cc
index 9c185fe..4b47034 100644
--- a/back_end/cpp/testcode/importer_test.cc
+++ b/back_end/cpp/testcode/importer_test.cc
@@ -14,11 +14,11 @@
 
 // Tests for using imported types.
 
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/importer.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/inline_type_test.cc b/back_end/cpp/testcode/inline_type_test.cc
index bf5ca7a..db0221a 100644
--- a/back_end/cpp/testcode/inline_type_test.cc
+++ b/back_end/cpp/testcode/inline_type_test.cc
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 // Tests for types defined inline.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/inline_type.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/int_sizes_test.cc b/back_end/cpp/testcode/int_sizes_test.cc
index c41f671..722102c 100644
--- a/back_end/cpp/testcode/int_sizes_test.cc
+++ b/back_end/cpp/testcode/int_sizes_test.cc
@@ -16,11 +16,11 @@
 // nested_structure.emb.
 //
 // These tests check that nested structures work.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/int_sizes.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/namespace_test.cc b/back_end/cpp/testcode/namespace_test.cc
index d2ef995..f8f28b6 100644
--- a/back_end/cpp/testcode/namespace_test.cc
+++ b/back_end/cpp/testcode/namespace_test.cc
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 // Tests that generated code ends up in the correct C++ namespaces.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/absolute_cpp_namespace.emb.h"
 #include "testdata/cpp_namespace.emb.h"
 #include "testdata/no_cpp_namespace.emb.h"
diff --git a/back_end/cpp/testcode/nested_structure_test.cc b/back_end/cpp/testcode/nested_structure_test.cc
index 737d938..9813b4b 100644
--- a/back_end/cpp/testcode/nested_structure_test.cc
+++ b/back_end/cpp/testcode/nested_structure_test.cc
@@ -16,11 +16,11 @@
 // nested_structure.emb.
 //
 // These tests check that nested structures work.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/nested_structure.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/parameters_test.cc b/back_end/cpp/testcode/parameters_test.cc
index 6179795..2410357 100644
--- a/back_end/cpp/testcode/parameters_test.cc
+++ b/back_end/cpp/testcode/parameters_test.cc
@@ -13,13 +13,13 @@
 // limitations under the License.
 
 // Tests of generated code for virtual fields.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <type_traits>
 #include <utility>
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/parameters.emb.h"
 
 namespace emboss_test {
diff --git a/back_end/cpp/testcode/read_log_file_status_test.cc b/back_end/cpp/testcode/read_log_file_status_test.cc
index 5f32b2d..5d91b32 100644
--- a/back_end/cpp/testcode/read_log_file_status_test.cc
+++ b/back_end/cpp/testcode/read_log_file_status_test.cc
@@ -14,11 +14,11 @@
 
 // Tests for the generated View class for a LogFileStatus from
 // span_se_log_file_status.emb.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/golden/span_se_log_file_status.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/requires_test.cc b/back_end/cpp/testcode/requires_test.cc
index d106658..66fbe7f 100644
--- a/back_end/cpp/testcode/requires_test.cc
+++ b/back_end/cpp/testcode/requires_test.cc
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 // Tests for [requires] using requires.emb.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/requires.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/start_size_range_test.cc b/back_end/cpp/testcode/start_size_range_test.cc
index 58a4158..7a05e3f 100644
--- a/back_end/cpp/testcode/start_size_range_test.cc
+++ b/back_end/cpp/testcode/start_size_range_test.cc
@@ -14,9 +14,9 @@
 
 // Test for the generated View class for StartSize from start_size_range.emb.
 
-#include <gtest/gtest.h>
 #include <stdint.h>
 
+#include "gtest/gtest.h"
 #include "testdata/start_size_range.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/subtypes_test.cc b/back_end/cpp/testcode/subtypes_test.cc
index 999a2a3..2b96354 100644
--- a/back_end/cpp/testcode/subtypes_test.cc
+++ b/back_end/cpp/testcode/subtypes_test.cc
@@ -15,11 +15,11 @@
 // Tests for the generated View class from subtypes.emb.
 //
 // These tests check that nested types work.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/subtypes.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/text_format_test.cc b/back_end/cpp/testcode/text_format_test.cc
index 255cf91..7b78b56 100644
--- a/back_end/cpp/testcode/text_format_test.cc
+++ b/back_end/cpp/testcode/text_format_test.cc
@@ -13,13 +13,13 @@
 // limitations under the License.
 
 // Tests of generated code for text format.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <type_traits>
 #include <utility>
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/text_format.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/uint_sizes_test.cc b/back_end/cpp/testcode/uint_sizes_test.cc
index c96d201..2513dff 100644
--- a/back_end/cpp/testcode/uint_sizes_test.cc
+++ b/back_end/cpp/testcode/uint_sizes_test.cc
@@ -16,11 +16,11 @@
 // nested_structure.emb.
 //
 // These tests check that nested structures work.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/uint_sizes.emb.h"
 
 namespace emboss {
diff --git a/back_end/cpp/testcode/virtual_field_test.cc b/back_end/cpp/testcode/virtual_field_test.cc
index 7f00765..1c5de41 100644
--- a/back_end/cpp/testcode/virtual_field_test.cc
+++ b/back_end/cpp/testcode/virtual_field_test.cc
@@ -13,13 +13,13 @@
 // limitations under the License.
 
 // Tests of generated code for virtual fields.
-#include <gtest/gtest.h>
 #include <stdint.h>
 
 #include <type_traits>
 #include <utility>
 #include <vector>
 
+#include "gtest/gtest.h"
 #include "testdata/virtual_field.emb.h"
 
 namespace emboss {
diff --git a/public/emboss_arithmetic_test.cc b/public/emboss_arithmetic_test.cc
index eeca5d8..42ccd6d 100644
--- a/public/emboss_arithmetic_test.cc
+++ b/public/emboss_arithmetic_test.cc
@@ -14,7 +14,7 @@
 
 #include "public/emboss_arithmetic.h"
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 namespace emboss {
 namespace support {
diff --git a/public/emboss_array_view_test.cc b/public/emboss_array_view_test.cc
index 612cb88..aa9fde2 100644
--- a/public/emboss_array_view_test.cc
+++ b/public/emboss_array_view_test.cc
@@ -14,12 +14,11 @@
 
 #include "public/emboss_array_view.h"
 
-#include <gtest/gtest.h>
-
 #include <string>
 #include <type_traits>
 
 #include "absl/strings/str_format.h"
+#include "gtest/gtest.h"
 #include "public/emboss_prelude.h"
 
 namespace emboss {
diff --git a/public/emboss_bit_util_test.cc b/public/emboss_bit_util_test.cc
index 7a0dbae..28fa1c8 100644
--- a/public/emboss_bit_util_test.cc
+++ b/public/emboss_bit_util_test.cc
@@ -14,7 +14,7 @@
 
 #include "public/emboss_bit_util.h"
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 namespace emboss {
 namespace support {
diff --git a/public/emboss_constant_view_test.cc b/public/emboss_constant_view_test.cc
index aafc14e..1f49466 100644
--- a/public/emboss_constant_view_test.cc
+++ b/public/emboss_constant_view_test.cc
@@ -14,7 +14,7 @@
 
 #include "public/emboss_constant_view.h"
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 namespace emboss {
 namespace support {
diff --git a/public/emboss_cpp_types_test.cc b/public/emboss_cpp_types_test.cc
index ab607a5..d71a2df 100644
--- a/public/emboss_cpp_types_test.cc
+++ b/public/emboss_cpp_types_test.cc
@@ -14,7 +14,7 @@
 
 #include "public/emboss_cpp_types.h"
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 namespace emboss {
 namespace support {
diff --git a/public/emboss_cpp_util_google_integration_test.cc b/public/emboss_cpp_util_google_integration_test.cc
index 15309a4..7592a1a 100644
--- a/public/emboss_cpp_util_google_integration_test.cc
+++ b/public/emboss_cpp_util_google_integration_test.cc
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
-
-#include "public/emboss_cpp_util.h"
 #include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
+#include "public/emboss_cpp_util.h"
 
 namespace emboss {
 namespace support {
diff --git a/public/emboss_defines_test.cc b/public/emboss_defines_test.cc
index c0cceb8..1cf0779 100644
--- a/public/emboss_defines_test.cc
+++ b/public/emboss_defines_test.cc
@@ -14,10 +14,10 @@
 
 #include "public/emboss_defines.h"
 
-#include <gtest/gtest.h>
-
 #include <cstdint>
 
+#include "gtest/gtest.h"
+
 namespace emboss {
 namespace support {
 namespace test {
diff --git a/public/emboss_enum_view_test.cc b/public/emboss_enum_view_test.cc
index 4a0eb4e..6723e07 100644
--- a/public/emboss_enum_view_test.cc
+++ b/public/emboss_enum_view_test.cc
@@ -14,8 +14,7 @@
 
 #include "public/emboss_enum_view.h"
 
-#include <gtest/gtest.h>
-
+#include "gtest/gtest.h"
 #include "public/emboss_prelude.h"
 
 namespace emboss {
diff --git a/public/emboss_maybe_test.cc b/public/emboss_maybe_test.cc
index acbf917..1373617 100644
--- a/public/emboss_maybe_test.cc
+++ b/public/emboss_maybe_test.cc
@@ -14,8 +14,8 @@
 
 #include "public/emboss_maybe.h"
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 
 namespace emboss {
 namespace support {
diff --git a/public/emboss_memory_util_test.cc b/public/emboss_memory_util_test.cc
index 779332d..074e0e1 100644
--- a/public/emboss_memory_util_test.cc
+++ b/public/emboss_memory_util_test.cc
@@ -14,8 +14,7 @@
 
 #include "public/emboss_memory_util.h"
 
-#include <gtest/gtest.h>
-
+#include "gtest/gtest.h"
 #include "public/emboss_prelude.h"
 
 namespace emboss {
diff --git a/public/emboss_prelude_test.cc b/public/emboss_prelude_test.cc
index 0938ca6..599519a 100644
--- a/public/emboss_prelude_test.cc
+++ b/public/emboss_prelude_test.cc
@@ -14,10 +14,9 @@
 
 #include "public/emboss_prelude.h"
 
-#include <gtest/gtest.h>
-
 #include <type_traits>
 
+#include "gtest/gtest.h"
 #include "public/emboss_cpp_util.h"
 
 namespace emboss {
diff --git a/public/emboss_test_util_test.cc b/public/emboss_test_util_test.cc
index 6ff223e..4e886a6 100644
--- a/public/emboss_test_util_test.cc
+++ b/public/emboss_test_util_test.cc
@@ -14,9 +14,8 @@
 
 #include "public/emboss_test_util.h"
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "testdata/complex_structure.emb.h"
 
 namespace emboss {
diff --git a/public/emboss_text_util_test.cc b/public/emboss_text_util_test.cc
index 5fa7d9a..742bcae 100644
--- a/public/emboss_text_util_test.cc
+++ b/public/emboss_text_util_test.cc
@@ -14,11 +14,11 @@
 
 #include "public/emboss_text_util.h"
 
-#include <gtest/gtest.h>
-
 #include <cmath>
 #include <limits>
 
+#include "gtest/gtest.h"
+
 namespace emboss {
 namespace support {
 namespace test {