I added checks against testing.Short for tests that took longer than about one second on my machine. Running with -short reduces the test time of rpc/client from about 28s to about 3.6s.