Merge in default

2 files changed, 8 insertions, 5 deletions

diff --git a/test/src/rabbit_tests.erl b/test/src/rabbit_tests.erl
index ef6b756b14..dcbec8f606 100644
--- a/test/src/rabbit_tests.erl
+++ b/test/src/rabbit_tests.erl
@@ -1292,11 +1292,9 @@ test_spawn_remote() ->
     end.
 
 user(Username) ->
-    #user{username     = Username,
-          tags         = [administrator],
-          auth_backend = rabbit_auth_backend_internal,
-          impl         = #internal_user{username = Username,
-                                        tags     = [administrator]}}.
+    #user{username       = Username,
+          tags           = [administrator],
+          authz_backends = [{rabbit_auth_backend_internal, none}]}.
 
 test_confirms() ->
     {_Writer, Ch} = test_spawn(),
diff --git a/test/src/supervisor2_tests.erl b/test/src/supervisor2_tests.erl
index 4d362e5bca..195211b07a 100644
--- a/test/src/supervisor2_tests.erl
+++ b/test/src/supervisor2_tests.erl
@@ -49,7 +49,12 @@ check_shutdown(SigStop, Iterations, ChildCount, SupTimeout) ->
                     R
             end, ok, lists:seq(1, Iterations)),
     unlink(Sup),
+    MSupRef = erlang:monitor(process, Sup),
     exit(Sup, shutdown),
+    receive
+        {'DOWN', MSupRef, process, Sup, _Reason} ->
+            ok
+    end,
     Res.
 
 start_link() ->