1 files changed, 14 insertions, 3 deletions
diff --git a/lib/stdlib/test/unicode_util_SUITE.erl b/lib/stdlib/test/unicode_util_SUITE.erl
index 7dba0a2fd0..632d9ae6e6 100644
--- a/lib/stdlib/test/unicode_util_SUITE.erl
+++ b/lib/stdlib/test/unicode_util_SUITE.erl
@@ -312,12 +312,23 @@ get(_) ->
     add_get_tests.
 
 count(Config) ->
+    Parent = self(),
+    Exec = fun() ->
+                   do_measure(Config),
+                   Parent ! {test_done, self()}
+           end,
     ct:timetrap({minutes,5}),
     case ct:get_timetrap_info() of
-        {_,{_,Scale}} ->
+        {_,{_,Scale}} when Scale > 1 ->
             {skip,{measurments_skipped_debug,Scale}};
-        _ -> % No scaling
-            do_measure(Config)
+        _ -> % No scaling, run at most 2 min
+            Tester = spawn(Exec),
+            receive {test_done, Tester} -> ok
+            after 120000 ->
+                    io:format("Timelimit reached stopping~n",[]),
+                    exit(Tester, die)
+            end,
+            ok
     end.
 
 do_measure(Config) ->