diff --git a/cc/cc_test.go b/cc/cc_test.go
index e2dba9043..ed13e22d4 100644
--- a/cc/cc_test.go
+++ b/cc/cc_test.go
@@ -4818,7 +4818,7 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
 
 	cflags := []string{"-Werror", "-std=candcpp"}
 	cstd := []string{"-std=gnu17", "-std=conly"}
-	cppstd := []string{"-std=gnu++17", "-std=cpp", "-fno-rtti"}
+	cppstd := []string{"-std=gnu++20", "-std=cpp", "-fno-rtti"}
 
 	lastIncludes := []string{
 		"out/soong/ndk/sysroot/usr/include",
diff --git a/cc/config/global.go b/cc/config/global.go
index 2ca9df9a1..bc067ad17 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -357,7 +357,7 @@ var (
 	}
 
 	CStdVersion               = "gnu17"
-	CppStdVersion             = "gnu++17"
+	CppStdVersion             = "gnu++20"
 	ExperimentalCStdVersion   = "gnu2x"
 	ExperimentalCppStdVersion = "gnu++2a"