diff --git a/api/src/main/java/io/grpc/TlsServerCredentials.java b/api/src/main/java/io/grpc/TlsServerCredentials.java
index ab9cc60b0f13..25984ee5c098 100644
--- a/api/src/main/java/io/grpc/TlsServerCredentials.java
+++ b/api/src/main/java/io/grpc/TlsServerCredentials.java
@@ -76,7 +76,7 @@ public byte[] getCertificateChain() {
 
   /**
    * The private key, as a new byte array. Generally should be in PKCS#8 format. If encrypted,
-   * {@link #getPrivateKeyPassword} is the decryption key. If unencrypted, the password must be
+   * {@link #getPrivateKeyPassword} is the decryption key. If unencrypted, the password will be
    * {@code null}.
    */
   public byte[] getPrivateKey() {
diff --git a/api/src/test/java/io/grpc/ManagedChannelRegistryTest.java b/api/src/test/java/io/grpc/ManagedChannelRegistryTest.java
index 68d666ff1073..9266559c0bba 100644
--- a/api/src/test/java/io/grpc/ManagedChannelRegistryTest.java
+++ b/api/src/test/java/io/grpc/ManagedChannelRegistryTest.java
@@ -30,7 +30,7 @@ public class ManagedChannelRegistryTest {
   private ChannelCredentials creds = new ChannelCredentials() {};
 
   @Test
-  public void register_unavilableProviderThrows() {
+  public void register_unavailableProviderThrows() {
     ManagedChannelRegistry reg = new ManagedChannelRegistry();
     try {
       reg.register(new BaseProvider(false, 5));
diff --git a/api/src/test/java/io/grpc/ServerRegistryTest.java b/api/src/test/java/io/grpc/ServerRegistryTest.java
index d774ddae304b..377f9eda7378 100644
--- a/api/src/test/java/io/grpc/ServerRegistryTest.java
+++ b/api/src/test/java/io/grpc/ServerRegistryTest.java
@@ -30,7 +30,7 @@ public class ServerRegistryTest {
   private ServerCredentials creds = new ServerCredentials() {};
 
   @Test
-  public void register_unavilableProviderThrows() {
+  public void register_unavailableProviderThrows() {
     ServerRegistry reg = new ServerRegistry();
     try {
       reg.register(new BaseProvider(false, 5));