diff --git a/test/suite.erl b/test/suite.erl
index ecdbd71fb..efe587253 100644
--- a/test/suite.erl
+++ b/test/suite.erl
@@ -471,9 +471,7 @@ wait_auth_SASL_result(Config, ShouldFail) ->
 	    NS = if Type == client -> ?NS_CLIENT;
 		    Type == server -> ?NS_SERVER
 		 end,
-	    Config2 = receive #stream_start{id = ID, xmlns = NS, version = {1,0}} ->
-		set_opt(stream_id, ID, Config)
-	    end,
+	    receive #stream_start{xmlns = NS, version = {1,0}} -> ok end,
             receive #stream_features{sub_els = Fs} ->
 		    if Type == client ->
 			    #xmpp_session{optional = true} =
@@ -490,7 +488,7 @@ wait_auth_SASL_result(Config, ShouldFail) ->
 			      set_opt(rosterver, true, ConfigAcc);
 			 (_, ConfigAcc) ->
 			      ConfigAcc
-		      end, Config2, Fs)
+		      end, Config, Fs)
 	    end;
         #sasl_challenge{text = ClientIn} ->
             {Response, SASL} = (?config(sasl, Config))(ClientIn),
diff --git a/test/suite.hrl b/test/suite.hrl
index adc14e93a..b2515d8ce 100644
--- a/test/suite.hrl
+++ b/test/suite.hrl
@@ -66,12 +66,14 @@
          end)()).
 
 -define(match(Pattern, Result),
+    (fun() ->
 	case Result of
 	    Pattern ->
-		Pattern;
+		ok;
 	    Mismatch ->
 		suite:match_failure([Mismatch], [??Pattern])
-	end).
+	end
+    end)()).
 
 -define(COMMON_VHOST, <<"localhost">>).
 -define(MNESIA_VHOST, <<"mnesia.localhost">>).