diff --git a/tests/pb_cipher_suites.erl b/tests/pb_cipher_suites.erl
index 59f6a57e..5618c89e 100644
--- a/tests/pb_cipher_suites.erl
+++ b/tests/pb_cipher_suites.erl
@@ -28,10 +28,13 @@ confirm() ->
     make_certs:revoke(CertDir, "rootCA", "revokedCA"),
 
     %% start a HTTP server to serve the CRLs
-    inets:start(httpd, [{port, 8000}, {server_name, "localhost"},
+    %%
+    %% NB: we use the 'stand_alone' option to link the server to the
+    %% test process, so it exits when the test process exits.
+    {ok, _HTTPPid} = inets:start(httpd, [{port, 8000}, {server_name, "localhost"},
                         {server_root, "/tmp"},
                         {document_root, CertDir},
-                        {modules, [mod_get]}]),
+                        {modules, [mod_get]}], stand_alone),
 
     lager:info("Deploy some nodes"),
     Conf = [{riak_core, [
diff --git a/tests/pb_security.erl b/tests/pb_security.erl
index d1b78061..df199c28 100644
--- a/tests/pb_security.erl
+++ b/tests/pb_security.erl
@@ -41,10 +41,13 @@ confirm() ->
     make_certs:gencrl(CertDir, "site1.basho.com"),
 
     %% start a HTTP server to serve the CRLs
-    inets:start(httpd, [{port, 8000}, {server_name, "localhost"},
+    %%
+    %% NB: we use the 'stand_alone' option to link the server to the
+    %% test process, so it exits when the test process exits.
+    {ok, _HTTPPid} = inets:start(httpd, [{port, 8000}, {server_name, "localhost"},
                         {server_root, "/tmp"},
                         {document_root, CertDir},
-                        {modules, [mod_get]}]),
+                        {modules, [mod_get]}], stand_alone),
 
     lager:info("Deploy some nodes"),
     PrivDir = rt:priv_dir(),