diff --git a/nomad/rpc_test.go b/nomad/rpc_test.go
index 79f88bd37..699aba2cf 100644
--- a/nomad/rpc_test.go
+++ b/nomad/rpc_test.go
@@ -1151,7 +1151,7 @@ func TestRPC_TLS_Enforcement_RPC(t *testing.T) {
 	defer tlsHelper.cleanup()
 
 	standardRPCs := map[string]interface{}{
-		"Status.Ping": struct{}{},
+		"Status.Ping": &structs.GenericRequest{},
 	}
 
 	localServersOnlyRPCs := map[string]interface{}{
@@ -1409,6 +1409,7 @@ func newTLSTestHelper(t *testing.T) tlsTestHelper {
 			KeyFile:              h.serverCert + ".key",
 		}
 	})
+	testutil.WaitForLeader(t, h.nonVerifyServer.RPC)
 
 	return h
 }