4 files changed, 9 insertions, 18 deletions
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 084cc36ae3..cf3e53c0cd 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -4552,16 +4552,16 @@ build_table2(L1,L2,Num) ->
     T.
 
 time_match_object(Tab,Match, Res) ->
-    T1 = erlang:now(),
+    T1 = erlang:monotonic_time(micro_seconds),
     Res = ets:match_object(Tab,Match),
-    T2 = erlang:now(),
-    nowdiff(T1,T2).
+    T2 = erlang:monotonic_time(micro_seconds),
+    T2 - T1.
 
 time_match(Tab,Match) ->
-    T1 = erlang:now(),
+    T1 = erlang:monotonic_time(micro_seconds),
     ets:match(Tab,Match),
-    T2 = erlang:now(),
-    nowdiff(T1,T2).
+    T2 = erlang:monotonic_time(micro_seconds),
+    T2 - T1.
 
 seventyfive_percent_success(_,S,Fa,0) ->
     true = (S > ((S + Fa) * 0.75));
@@ -4586,11 +4586,6 @@ fifty_percent_success({M,F,A},S,Fa,N) ->
     end.
 
 
-nowtonumber({Mega, Secs, Milli}) ->
-    Milli + Secs * 1000000 + Mega * 1000000000000.
-nowdiff(T1,T2) ->
-    nowtonumber(T2) - nowtonumber(T1).
-
 create_random_string(0) ->
     [];
 
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl
index 463b12535d..858a78b1d2 100644
--- a/lib/stdlib/test/io_proto_SUITE.erl
+++ b/lib/stdlib/test/io_proto_SUITE.erl
@@ -1766,8 +1766,7 @@ toerl_loop(Port,Acc) ->
     end.
 	
 millistamp() ->
-    {Mega, Secs, Micros} = erlang:now(),
-    (Micros div 1000) + Secs * 1000 + Mega * 1000000000.
+    erlang:monotonic_time(milli_seconds).
     
 get_data_within(Port, X, Acc) when X =< 0 ->
     ?dbg({get_data_within, X, Acc, ?LINE}),
diff --git a/lib/stdlib/test/timer_SUITE.erl b/lib/stdlib/test/timer_SUITE.erl
index 6ece2e897f..ae32d98807 100644
--- a/lib/stdlib/test/timer_SUITE.erl
+++ b/lib/stdlib/test/timer_SUITE.erl
@@ -361,9 +361,7 @@ res_combine({error,Es}, [{error,E}|T]) ->
 
 
 system_time() ->
-    %%element(1, statistics(wall_clock)).
-    {M,S,U} = erlang:now(),
-    1000000000 * M + 1000 * S + (U div 1000).
+    erlang:monotonic_time(milli_seconds).
 
 %% ------------------------------------------------------- %%
 
diff --git a/lib/stdlib/test/timer_simple_SUITE.erl b/lib/stdlib/test/timer_simple_SUITE.erl
index 917624b56b..3c7e3c5f25 100644
--- a/lib/stdlib/test/timer_simple_SUITE.erl
+++ b/lib/stdlib/test/timer_simple_SUITE.erl
@@ -482,8 +482,7 @@ append([],X) ->
 	X.
 
 system_time() ->    
-    {M,S,U} = erlang:now(),
-    1000000*(M*1000000 + S) + U.
+    erlang:monotonic_time(micro_seconds).
 
 %% ------------------------------------------------------- %%