diff --git a/src/hydra_client.app.src b/src/hydra_client.app.src
index 84b60b7..07f8c5f 100644
--- a/src/hydra_client.app.src
+++ b/src/hydra_client.app.src
@@ -4,11 +4,12 @@
     {modules, []},
     {registered, []},
     {applications, [
+        gproc,
+        jsx,
         kernel,
-        stdlib,
-        turtle,
         msgpack,
-        jsx
+        stdlib,
+        turtle
     ]},
     {mod, {hydra_client_app, []}},
     {env, [
diff --git a/src/hydra_client.erl b/src/hydra_client.erl
index 0d29af3..91f04df 100644
--- a/src/hydra_client.erl
+++ b/src/hydra_client.erl
@@ -40,6 +40,11 @@
 %% Debug API.
 -export([ping/1]).

+%% Connectivity API.
+-export([await/0,
+         await/1
+        ]).
+
 %% Private API.
 -export([call/2,
          format_object/1]).
@@ -646,6 +651,22 @@ ping(Value) when is_binary(Value) ->
             Error
     end.

+%% @doc Wait until our connection to Hydra is established.
+-spec await() -> ok.
+await() ->
+    await(infinity).
+
+-spec await(Timeout) -> ok | timeout
+    when
+        Timeout :: non_neg_integer() | infinity.
+await(Timeout) ->
+    try gproc:await({n,l,{turtle, publisher, hydra_client_rpc}}, Timeout) of
+        {_, _} ->
+            ok
+    catch _:_ ->
+        timeout
+    end.
+
 %% @private
 -spec truncate(Secret) -> {ok, boolean()} | {error, term()}
     when
diff --git a/test/hydra_client_SUITE.erl b/test/hydra_client_SUITE.erl
index b6ce088..a390b1f 100644
--- a/test/hydra_client_SUITE.erl
+++ b/test/hydra_client_SUITE.erl
@@ -42,7 +42,7 @@ init_per_group(Name, Config) ->
     case Name of
         hydra_client ->
             {ok, _} = application:ensure_all_started(hydra_client),
-            timer:sleep(500),
+            ok = hydra_client:await(500),
             [{client, Name} | Config];

         hydra_client_test ->