4 files changed, 9 insertions, 7 deletions
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index 2b821ac141..464763d43f 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -909,9 +909,11 @@ otp_7233_1(Rec) ->
     case K of
 	<<"XX">> ->
 	    Value = Rec#rec_otp_7233.val,
-	    case lists:keysearch("xxxxxxxx", 1, Value) of
-		{value,T} -> put(io_format, [Rec#rec_otp_7233.key,T]);
-		false -> ok
+	    case lists:keyfind("xxxxxxxx", 1, Value) of
+		false ->
+		    ok;
+		T ->
+		    put(io_format, [Rec#rec_otp_7233.key,T])
 	    end;
 	_ -> ok
     end.
diff --git a/lib/compiler/test/compilation_SUITE.erl b/lib/compiler/test/compilation_SUITE.erl
index 6c90a38f5a..ae3c5ccc20 100644
--- a/lib/compiler/test/compilation_SUITE.erl
+++ b/lib/compiler/test/compilation_SUITE.erl
@@ -394,7 +394,7 @@ vsn_3(Conf) when is_list(Conf) ->
     ok.
 
 get_vsn(M) ->
-    {value, {vsn, V}} = lists:keysearch(vsn, 1, M:module_info(attributes)),
+    {vsn,V} = lists:keyfind(vsn, 1, M:module_info(attributes)),
     V.
 
 long_string(Config) when is_list(Config) ->
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index 4eb42f81cc..8c4957d377 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -455,8 +455,8 @@ encrypted_abstr_1(Simple, Target) ->
 
     ?line {ok,{simple,[{compile_info,CInfo}]}} = 
 	beam_lib:chunks(Target, [compile_info]),
-    ?line {value,{_,Opts}} = lists:keysearch(options, 1, CInfo),
-    ?line {value,{_,'********'}} = lists:keysearch(debug_info_key, 1, Opts),
+    {_,Opts} = lists:keyfind(options, 1, CInfo),
+    {_,'********'} = lists:keyfind(debug_info_key, 1, Opts),
 
     %% Try some illegal forms of crypto keys.
     ?line error = compile:file(Simple,
diff --git a/lib/compiler/test/test_lib.erl b/lib/compiler/test/test_lib.erl
index 6a0237373a..3ca93fb021 100644
--- a/lib/compiler/test/test_lib.erl
+++ b/lib/compiler/test/test_lib.erl
@@ -66,7 +66,7 @@ uniq() ->
 
 opt_opts(Mod) ->
     Comp = Mod:module_info(compile),
-    {value,{options,Opts}} = lists:keysearch(options, 1, Comp),
+    {options,Opts} = lists:keyfind(options, 1, Comp),
     lists:filter(fun(no_copt) -> true;
 		    (no_postopt) -> true;
 		    (no_float_opt) -> true;