diff --git a/interop/data/ca.pem b/interop/data/ca.pem
index 841147934..4176c0370 100644
--- a/interop/data/ca.pem
+++ b/interop/data/ca.pem
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDRjCCAi6gAwIBAgIQQS24If9oGkeiIDhCX3LptTANBgkqhkiG9w0BAQsFADA9
+MIIDRjCCAi6gAwIBAgIQd5pnuFdwgGxb4RiClYEPMTANBgkqhkiG9w0BAQsFADA9
 MQ4wDAYDVQQKEwVUb2tpbzEQMA4GA1UECxMHVGVzdGluZzEZMBcGA1UEAxMQVG9u
-aWMgVGVzdGluZyBDQTAeFw0yNDExMTMxOTQ0MzBaFw0zNDExMTExOTQ0MzBaMD0x
+aWMgVGVzdGluZyBDQTAeFw0yNTA1MDExNzQyNThaFw0zNTA0MjkxNzQyNThaMD0x
 DjAMBgNVBAoTBVRva2lvMRAwDgYDVQQLEwdUZXN0aW5nMRkwFwYDVQQDExBUb25p
-YyBUZXN0aW5nIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuRMq
-OMDsXvkEc/ArFxHhNNd1qIRhgPElLR/de091WVEKGGQI7OEJLE5/dfD2RMe0PdvZ
-tEhURM/SUkreYeJhC7AFbAVM6cDC7Lj+GB1v63EbpFTDkkrJ5+GN7DtID/FNYg4M
-sBlHCMys2ZWByAy6/fBZ4PKyJbMX4gtySLAyCTqI/BV1TC/7tgxiNrSNv/MZiqqO
-FOdAfpkdb/mGWkxOB+JYWT8QBjIWcWaoWJcwmlY4ZC6U5aaNxO3VKDdGyghKkPS7
-nDAMe5H3Cl/rR1TKY3A9TVcE4qQ514647NQpCoOJZ39PbXJy+S4v3qI61IvFBPFh
-C3tgZABh8h9dO7ddGQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQU6k4lLdVI7YCNA9eQBb8hO3nIFVQwDQYJKoZIhvcN
-AQELBQADggEBADhJOxK2tPlai1pSwT0ud7oXXfAQpI1PZ9FxWR9qx1UsTLb3sfTW
-+20RQdguGXTby5wkHIiVJ6vAEDRd8X9oOf8vk2zvnmWLgiDdOh3e3OkOme6Qs+V9
-mXIA8JZnYGaqmAPcmZU5uY2lrf0oXURqb9ZNL5DCc1yJ1rVC3jCQLZZ1v6GGRNB5
-YhTWlQYUcu2nw8fN1scrV9322gU5siJzrNrjO9yabIYZyMpwcNwarvoxcVT8zLM5
-ZLUTjG2Yr8PJ13Bn2dyw8mDuL0ixXU34vQNIHBk1UmbzyWL9mDfu9RfpIDIDkEzK
-sO/HXgh4vzETaIhkEuW9porYX5d1QyVED8I=
+YyBUZXN0aW5nIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2C37
+LVCs4RfNdwv8NMZfIdFNqrUdwzXZ+a5B7Pee1nOL+JD9feOGn1qGZI1ZgFMqVygN
+ejSkzlbouN9RAGgyBmOFFo3oEc+nz7kPrezBLoM3oVgNzhEixz2IQoafoZX3j48Y
+fpGYmrTHUp4MAwUAt6Zb+kD7YGqD8//I5OMM4Y5R8yuYGsJHUUSZqYfgXCk0ZvVG
+EX7zyr31cVLqto1vpuv5Uvp6WX5oGgbZVB0wvlqs9Ak+dblWBZQIsrUPU8kn/6kx
+HilF8Lw24dRXr5oveFDMdD/n4sIh7Gr/O+VGH83gP/PawXy0WWn5qGAhdx+P99jI
+UGAWNetu4vGgASLFkwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQU4AI0rUoGKFxe0gXIYujrhnuNsocwDQYJKoZIhvcN
+AQELBQADggEBAEtSrTgz+suVMDRsdvxG7+BAcXfVc8pmou3KIFbDtIyog2BEU5nU
+Z+zBqrVgbGv9B4D7XLcZgTShY17cvJP8QpUwT/gzI9uR8Lig9JGF7n1K43+aiAk9
+s7H8e74rwyPX6mRmuznd1sJdDsc5lohUPpZVI+7pRywedQw+QG6/n2cVvR0k0Txh
+pF1XBpzuFA5t5uqW/v/QFqfGEuIDDMdW2JQSEB7UyH4V2yWswoYb/uf/xoNXWWqs
+Y6RVSp6qVW8748rPPwmLaN8hHGIUNUnilQIXr67bX8i3FjoLHhQvKqUEKciXJWj9
+ssGOvq0QoVZNPltcZp9yID3W2kyxv6Hq8VA=
 -----END CERTIFICATE-----
diff --git a/interop/data/server1.key b/interop/data/server1.key
index 064de36c8..e7666ab67 100644
--- a/interop/data/server1.key
+++ b/interop/data/server1.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/interop/data/server1.pem b/interop/data/server1.pem
index 3bcad6b8d..a64fc275e 100644
--- a/interop/data/server1.pem
+++ b/interop/data/server1.pem
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-AQEFAAOCAQ8AMIIBCgKCAQEA3IN57h6uzOii4giaDPPMhjc1Dm0gpX4GiwKCeo8j
-hhN37YjKOLCLGEYOoyBoMiYr/A5neJ6eixpp9qHGlq3youOHW81dEGqqtasTH7jd
-XFbnIY72Nz8DftzxD8XXrQu8ZjzHWRbFcmvApWEt/7GE1mhUAIDURTdf4JkqeOCV
-RnGWNat1owjypqjhpXGYG/TTfqT+Tw5987O3ZotBjcv//WLEmx1GhKKYKCFeDiRH
-9ozEtInHvBOP7u2kE1kU+7V1ijG/vdHSS5/E/KrXMVqxzoES58XNtUqsRH09Gji8
-ad/cD5GCk/3f9ZzUFVO33pnnyY5by6QbBevKQe1Jki0WTwIDAQABo2MwYTATBgNV
-HSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFOpOJS3V
-SO2AjQPXkAW/ITt5yBVUMBsGA1UdEQQUMBKCECoudGVzdC5nb29nbGUuZnIwDQYJ
-KoZIhvcNAQELBQADggEBABdvT3D98vfZxGPXddVG6SYMXLzoWrvF4R0joI2xzaiZ
-XlLwo2pPiYY/mUNjNEQCbz9cV4E+EWFzP36YSiFpiQHH65zhgMRMBTlwe6ma+ksJ
-kiBwwcDaugDGBrC5YGAypMB+a/8PZiUkODp6S/A4DgNCO4RO+c+lG1QCO335i41A
-hVJZVQUKQ2t8SbkVQmugDfZFrp/fDJVRGKwNKWM1d3B40/6TaUc0z9jHBGOzy3GI
-ZcO2Di5vqE+gY0oSb4MLlR3PIavPQvNhHCejD6qxIpivOMEpdNv2oAkcfoePuJQ3
-TfqJO8ybedfAGYf/p70Dw45lY7+/aGLIhnQ8nHQmUZE=
+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
 -----END CERTIFICATE-----
diff --git a/interop/test.sh b/interop/test.sh
index 6208a8117..c4628d164 100755
--- a/interop/test.sh
+++ b/interop/test.sh
@@ -74,12 +74,22 @@ sleep 1
 
 ./target/debug/client --test_case="${JOINED_TEST_CASES}" "${ARG}"
 
-TLS_ARGS=""
-
-if [ -n "${ARG}" ]; then
-  TLS_ARGS="--use_tls --use_test_ca --server_host_override=foo.test.google.fr --ca_file=${TLS_CA}"
+# Run client test cases
+if [ -n "${ARG:-}" ]; then
+  TLS_ARRAY=( \
+    -use_tls \
+    -use_test_ca \
+    -server_host_override=foo.test.google.fr \
+    -ca_file="${TLS_CA}" \
+  )
+else
+  TLS_ARRAY=()
 fi
 
 for CASE in "${TEST_CASES[@]}"; do
-  interop/bin/client_${OS}_amd64${EXT} --test_case="${CASE}" "${TLS_ARGS}"
+  flags=( "-test_case=${CASE}" )
+  flags+=( "${TLS_ARRAY[@]}" )
+
+  interop/bin/client_"${OS}"_amd64"${EXT}" "${flags[@]}"
 done
+