diff --git a/test/core/end2end/fixtures/h2_full+workarounds.c b/test/core/end2end/fixtures/h2_full+workarounds.c
index cc86c3abf36..67a4c1972d9 100644
--- a/test/core/end2end/fixtures/h2_full+workarounds.c
+++ b/test/core/end2end/fixtures/h2_full+workarounds.c
@@ -41,6 +41,7 @@
 #include <grpc/support/sync.h>
 #include <grpc/support/thd.h>
 #include <grpc/support/useful.h>
+#include <grpc/support/workaround_list.h>
 #include "src/core/ext/filters/client_channel/client_channel.h"
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
@@ -50,10 +51,8 @@
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
 
-/* List the workarounds to be enabled */
-static char *workarounds_enabled[] = {GRPC_ARG_WORKAROUND_CRONET_COMPRESSION};
-static const size_t workarounds_num =
-    sizeof(workarounds_enabled) / sizeof(*workarounds_enabled);
+static const size_t workarounds_num = GRPC_MAX_WORKAROUND_ID;
+static char *workarounds_enabled[GRPC_MAX_WORKAROUND_ID] = {GRPC_ARG_WORKAROUND_CRONET_COMPRESSION};
 
 typedef struct fullstack_fixture_data {
   char *localaddr;