Eliminate use of doc and suite clauses

Those clause are obsolete and never used by common_test.

57 files changed, 411 insertions, 1264 deletions

diff --git a/erts/emulator/test/a_SUITE.erl b/erts/emulator/test/a_SUITE.erl
index ebaf23b28a..8efb0fad53 100644
--- a/erts/emulator/test/a_SUITE.erl
+++ b/erts/emulator/test/a_SUITE.erl
@@ -38,10 +38,6 @@ suite() ->
 all() -> 
     [long_timers, pollset_size].
 
-long_timers(doc) ->
-    [];
-long_timers(suite) ->
-    [];
 long_timers(Config) when is_list(Config) ->
     Dir = proplists:get_value(data_dir, Config),
     ?line long_timers_test:start(Dir),
@@ -49,10 +45,6 @@ long_timers(Config) when is_list(Config) ->
 	   "Testcase started! This test will run in parallel with the "
 	   "erts testsuite and ends in the z_SUITE:long_timers testcase."}.
 
-pollset_size(doc) ->
-    [];
-pollset_size(suite) ->
-    [];
 pollset_size(Config) when is_list(Config) ->
     %% Ensure inet_gethost_native port program started, in order to
     %% allow other suites to use it...
diff --git a/erts/emulator/test/after_SUITE.erl b/erts/emulator/test/after_SUITE.erl
index 40fd2e6500..4efc3b68a0 100644
--- a/erts/emulator/test/after_SUITE.erl
+++ b/erts/emulator/test/after_SUITE.erl
@@ -71,9 +71,8 @@ frequent_process() ->
 		?line frequent_process()
 	end.
 
-receive_after(doc) ->
-    "Test that 'receive after' works (doesn't hang). "
-    "The test takes 10 seconds to complete.";
+%%  Test that 'receive after' works (doesn't hang).
+%%  The test takes 10 seconds to complete.
 receive_after(Config) when is_list(Config) ->
     ?line receive_after1(5000).
 
@@ -137,7 +136,7 @@ receive_after_errors(Config) when is_list(Config) ->
 try_after(Timeout) ->
     {'EXIT',{timeout_value,_}} = (catch receive after Timeout -> ok end).
 
-receive_var_zero(doc) -> "Test 'after Z', when Z == 0.";
+%% Test 'after Z', when Z == 0.
 receive_var_zero(Config) when is_list(Config) ->
     self() ! x,
     self() ! y,
@@ -177,9 +176,8 @@ receive_zero(Config) when is_list(Config) ->
 	    ct:fail({bad_message,Other})
     end.
 
-multi_timeout(doc) ->
-    "Test for catching invalid assertion in erl_message.c (in queue_message)."
-    "This failed (dumped core) with debug-compiled emulator.";
+%% Test for catching invalid assertion in erl_message.c (in queue_message)
+%% This failed (dumped core) with debug-compiled emulator.
 multi_timeout(Config) when is_list(Config) ->
     ?line P = spawn(?MODULE, timeout_g, []),
     ?line P ! a,
diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl
index b3b0d6d57e..cb6c8d6012 100644
--- a/erts/emulator/test/alloc_SUITE.erl
+++ b/erts/emulator/test/alloc_SUITE.erl
@@ -54,40 +54,22 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 %% Testcases                                                              %%
 %%                                                                        %%
 
-basic(suite) -> [];
-basic(doc) ->   [];
 basic(Cfg) -> ?line drv_case(Cfg).
 
-coalesce(suite) -> [];
-coalesce(doc) ->   [];
 coalesce(Cfg) -> ?line drv_case(Cfg).
 
-threads(suite) -> [];
-threads(doc) ->   [];
 threads(Cfg) -> ?line drv_case(Cfg).
 
-realloc_copy(suite) -> [];
-realloc_copy(doc) ->   [];
 realloc_copy(Cfg) -> ?line drv_case(Cfg).
 
-bucket_index(suite) -> [];
-bucket_index(doc) ->   [];
 bucket_index(Cfg) -> ?line drv_case(Cfg).
 
-bucket_mask(suite) -> [];
-bucket_mask(doc) ->   [];
 bucket_mask(Cfg) -> ?line drv_case(Cfg).
 
-rbtree(suite) -> [];
-rbtree(doc) ->   [];
 rbtree(Cfg) -> ?line drv_case(Cfg).
 
-mseg_clear_cache(suite) -> [];
-mseg_clear_cache(doc) ->   [];
 mseg_clear_cache(Cfg) -> ?line drv_case(Cfg).
 
-cpool(suite) -> [];
-cpool(doc) ->   [];
 cpool(Cfg) -> ?line drv_case(Cfg).
 
 migration(Cfg) ->
diff --git a/erts/emulator/test/beam_literals_SUITE.erl b/erts/emulator/test/beam_literals_SUITE.erl
index 4cfc8e7d12..054579fff2 100644
--- a/erts/emulator/test/beam_literals_SUITE.erl
+++ b/erts/emulator/test/beam_literals_SUITE.erl
@@ -55,7 +55,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-putting(doc) -> "Test creating lists and tuples containing big number literals.";
+%% Test creating lists and tuples containing big number literals.
 putting(Config) when is_list(Config) ->
     -773973888575883407313908 = chksum(putting1(8987697898797)).
 
@@ -64,15 +64,14 @@ putting1(X) ->
      [X|349873987387373],
      [329878349873|-387394729872], -773973937933873929749873}.
 
-matching_bigs(doc) -> "Test matching of a few big number literals (in Beam,"
-		      "select_val/3 will NOT be used).";
+%% Test matching of a few big number literals (in Beam select_val/3 will NOT be used).
 matching_bigs(Config) when is_list(Config) ->
     a = matching1(3972907842873739),
     b = matching1(-389789298378939783333333333333333333784),
     other = matching1(3141699999999999999999999999999999999),
     other = matching1(42).
 
-matching_smalls(doc) -> "Test matching small numbers (both positive and negative).";
+%% Test matching small numbers (both positive and negative).
 matching_smalls(Config) when is_list(Config) ->
     ?line a = m_small(-42),
     ?line b = m_small(0),
@@ -90,9 +89,8 @@ m_small(-13) -> d;
 m_small(337848) -> e;
 m_small(_) -> other.
 
-matching_smalls_jt(doc) ->
-    "Test matching small numbers (both positive and negative). "
-	"Make sure that a jump table is used.";
+%% Test matching small numbers (both positive and negative).
+%% Make sure that a jump table is used.
 matching_smalls_jt(Config) when is_list(Config) ->
     ?line a = m_small_jt(-2),
     ?line b = m_small_jt(-1),
@@ -117,8 +115,7 @@ matching1(-389789298378939783333333333333333333784) -> b;
 matching1(_) -> other.
 
 
-matching_more_bigs(doc) -> "Test matching of a big number literals (in Beam,"
-		      "a select_val/3 instruction will be used).";
+%% Test matching of a big number literals (in Beam, a select_val/3 instruction will be used)
 matching_more_bigs(Config) when is_list(Config) ->
     a = matching2(-999766349740978337),
     b = matching2(9734097866575478),
@@ -137,8 +134,7 @@ matching2(13987294872948990) -> d;
 matching2(777723896192459245) -> e;
 matching2(_) -> other.
 
-matching_bigs_and_smalls(doc) -> "Test matching of a mix of big numbers and literals.";
-matching_bigs_and_smalls(suite) -> [];
+%% Test matching of a mix of big numbers and literals.
 matching_bigs_and_smalls(Config) when is_list(Config) ->
     a = matching3(38472928723987239873873),
     b = matching3(0),
@@ -159,7 +155,7 @@ matching3(42) -> e;
 matching3(-4533) -> f;
 matching3(_) -> other.
 
-badmatch(doc) -> "Test literal badmatches with big number and floats.";
+%% Test literal badmatches with big number and floats.
 badmatch(Config) when is_list(Config) ->
     %% We are satisfied if we can load this module and run it.
     Big = id(32984798729847892498297824872982972978239874),
@@ -210,8 +206,7 @@ try_case_clause_big() ->
 	    error
     end.
 
-receiving(doc) -> "Test receive with a big number literal (more than 27 bits, "
-		      "less than 32 bits).";
+%% Test receive with a big number literal (more than 27 bits, less than 32 bits).
 receiving(Config) when is_list(Config) ->
     Self = self(),
     spawn(fun() -> Self ! here_is_a_message end),
@@ -222,7 +217,7 @@ receiving(Config) when is_list(Config) ->
 		 timeout
 	 end.
 
-literal_type_tests(doc) -> "Test type tests on literal values.";
+%% Test type tests on literal values.
 literal_type_tests(Config) when is_list(Config) ->
     %% Generate an Erlang module with all different type of type tests.
     ?line Tests = make_test([{T, L} || T <- type_tests(), L <- literals()]),
diff --git a/erts/emulator/test/bif_SUITE.erl b/erts/emulator/test/bif_SUITE.erl
index ec8c7155b5..2768ad746f 100644
--- a/erts/emulator/test/bif_SUITE.erl
+++ b/erts/emulator/test/bif_SUITE.erl
@@ -45,10 +45,7 @@ all() ->
      atom_to_binary, binary_to_atom, binary_to_existing_atom,
      min_max, erlang_halt, is_builtin].
 
-display(suite) ->
-    [];
-display(doc) ->
-    ["Uses erlang:display to test that erts_printf does not do deep recursion"];
+%% Uses erlang:display to test that erts_printf does not do deep recursion
 display(Config) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     {ok, Node} = test_server:start_node(display_huge_term,peer,
@@ -351,10 +348,6 @@ t_list_to_existing_atom(Config) when is_list(Config) ->
     ?line UnlikelyAtom = list_to_existing_atom(UnlikelyStr),
     ok.
 
-os_env(doc) ->
-    [];
-os_env(suite) ->
-    [];
 os_env(Config) when is_list(Config) ->
     ?line EnvVar1 = "MjhgvFDrresdCghN mnjkUYg vfrD",
     ?line false = os:getenv(EnvVar1),
@@ -383,8 +376,7 @@ os_env_long(Min, Max, Value) ->
     true = os:unsetenv(EnvVar),
     ?line os_env_long(Min+1, Max, Value).
 
-otp_7526(doc) ->    
-    ["Test that string:to_integer does not Halloc in wrong order."];
+%% Test that string:to_integer does not Halloc in wrong order.
 otp_7526(Config) when is_list(Config) ->
     ok = test_7526(256).
 
diff --git a/erts/emulator/test/big_SUITE.erl b/erts/emulator/test/big_SUITE.erl
index 3cc812784a..57f4e502a5 100644
--- a/erts/emulator/test/big_SUITE.erl
+++ b/erts/emulator/test/big_SUITE.erl
@@ -75,7 +75,7 @@ eq_math(Config) when is_list(Config) ->
     test(TestFile).
 
 
-borders(doc) -> "Tests border cases between small/big.";
+%% Tests border cases between small/big.
 borders(Config) when is_list(Config) ->
     TestFile = test_file(Config, "borders.dat"),
     test(TestFile).
@@ -251,8 +251,7 @@ t_div(Config) when is_list(Config) ->
 init(ReplyTo, Fun, _Filler) ->
     ReplyTo ! {result, Fun()}.
 
-big_literals(doc) ->
-    "Tests that big-number literals work correctly.";
+%% Tests that big-number literals work correctly.
 big_literals(Config) when is_list(Config) ->
     %% Note: The literal test cannot be compiler on a pre-R4 Beam emulator,
     %% so we compile it now.
@@ -264,8 +263,7 @@ big_literals(Config) when is_list(Config) ->
     ok.
 
 
-big_float_1(doc) ->
-    ["OTP-2436, part 1"];
+%% OTP-2436, part 1
 big_float_1(Config) when is_list(Config) ->
     %% F is a number very close to a maximum float.
     ?line F = id(1.7e308),
@@ -289,8 +287,7 @@ big_float_1(Config) when is_list(Config) ->
     ?line true = (F =< I*I),
     ok.
 
-big_float_2(doc) ->
-    ["OTP-2436, part 2"];
+%% "OTP-2436, part 2
 big_float_2(Config) when is_list(Config) ->
     ?line F = id(1.7e308),
     ?line I = trunc(F),
@@ -299,8 +296,7 @@ big_float_2(Config) when is_list(Config) ->
     ?line {'EXIT', _} = (catch 4/(2*I)),
     ok.
 
-shift_limit_1(doc) ->
-    ["OTP-3256"];
+%% OTP-3256
 shift_limit_1(Config) when is_list(Config) ->
     ?line case catch (id(1) bsl 100000000) of
 	      {'EXIT', {system_limit, _}} ->
@@ -360,10 +356,7 @@ toobig() ->
     <<ANr:ASize>> = A, % should fail
     ANr band ANr.
 
-otp_6692(suite) ->
-    [];
-otp_6692(doc) ->
-    ["Tests for DIV/REM bug reported in OTP-6692"];
+%% Tests for DIV/REM bug reported in OTP-6692
 otp_6692(Config) when is_list(Config)->
     ?line loop1(1,1000).
 
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 65e2d2fdad..bc1cf62883 100644
--- a/erts/emulator/test/binary_SUITE.erl
+++ b/erts/emulator/test/binary_SUITE.erl
@@ -129,7 +129,6 @@ copy_server(Parent) ->
 %% Tests list_to_binary/1, binary_to_list/1 and size/1,
 %% using flat lists.
 
-conversions(suite) -> [];
 conversions(Config) when is_list(Config) ->
     ?line test_bin([]),
     ?line test_bin([1]),
@@ -258,7 +257,6 @@ test_deep_bitstr(List) ->
     Bin = list_to_bitstring(List),
     {Bin,bitstring_to_list(Bin)}.
 
-bad_list_to_binary(suite) -> [];
 bad_list_to_binary(Config) when is_list(Config) ->
     ?line test_bad_bin(atom),
     ?line test_bad_bin(42),
@@ -305,7 +303,7 @@ test_bad_bin(List) ->
     {'EXIT',{badarg,_}} = (catch list_to_bitstring(List)),
     {'EXIT',{badarg,_}} = (catch iolist_size(List)).
 
-bad_binary_to_list(doc) -> "Tries binary_to_list/1,3 with bad arguments.";
+%% Tries binary_to_list/1,3 with bad arguments.
 bad_binary_to_list(Config) when is_list(Config) ->
     ?line bad_bin_to_list(fun(X) -> X * 42 end),
 
@@ -327,7 +325,6 @@ bad_bin_to_list(Bin, First, Last) ->
     
 %% Tries to split a binary at all possible positions.
 
-t_split_binary(suite) -> [];
 t_split_binary(Config) when is_list(Config) ->
     ?line L = lists:seq(0, ?heap_binary_size-5), %Heap binary.
     ?line B = list_to_binary(L),
@@ -368,8 +365,7 @@ split(L, B, Pos) when Pos > 0 ->
 split(_L, _B, 0) ->
     ok.
 
-bad_split(doc) -> "Tries split_binary/2 with bad arguments.";
-bad_split(suite) -> [];
+%% Tries split_binary/2 with bad arguments.
 bad_split(Config) when is_list(Config) ->
     GoodBin = list_to_binary([1,2,3]),
     ?line bad_split(GoodBin, -1),
@@ -383,7 +379,7 @@ bad_split(Config) when is_list(Config) ->
 bad_split(Bin, Pos) ->
     {'EXIT',{badarg,_}} = (catch split_binary(Bin, Pos)).
 
-t_hash(doc) -> "Test hash/2 with different type of binaries.";
+%% Test hash/2 with different type of binaries.
 t_hash(Config) when is_list(Config) ->
     test_hash([]),
     test_hash([253]),
@@ -408,8 +404,7 @@ test_hash_1(Bin, Sbin, Unaligned, Hash) when is_function(Hash, 2) ->
 	    ct:fail("Different hash values: ~p, ~p, ~p\n", [H1,H2,H3])
     end.
 
-bad_size(doc) -> "Try bad arguments to size/1.";
-bad_size(suite) -> [];
+%% Try bad arguments to size/1.
 bad_size(Config) when is_list(Config) ->
     ?line {'EXIT',{badarg,_}} = (catch size(fun(X) -> X + 33 end)),
     ok.
@@ -580,8 +575,7 @@ build_iolist(N0, Base) ->
     end.
 
 
-bad_binary_to_term_2(doc) -> "OTP-4053.";
-bad_binary_to_term_2(suite) -> [];
+%% OTP-4053
 bad_binary_to_term_2(Config) when is_list(Config) ->
     ?line {ok, N} = test_server:start_node(plopp, slave, []),
     ?line R = rpc:call(N, erlang, binary_to_term, [<<131,111,255,255,255,0>>]),
@@ -594,7 +588,7 @@ bad_binary_to_term_2(Config) when is_list(Config) ->
     ?line test_server:stop_node(N),
     ok.
 
-bad_binary_to_term(doc) -> "Try bad input to binary_to_term/1.";
+%% Try bad input to binary_to_term/1.
 bad_binary_to_term(Config) when is_list(Config) ->
     ?line bad_bin_to_term(an_atom),
     ?line bad_bin_to_term({an,tuple}),
@@ -615,7 +609,7 @@ bad_bin_to_term(BadBin) ->
 bad_bin_to_term(BadBin,Opts) ->
     {'EXIT',{badarg,_}} = (catch binary_to_term_stress(BadBin,Opts)).
 
-safe_binary_to_term2(doc) -> "Test safety options for binary_to_term/2";
+%% Test safety options for binary_to_term/2
 safe_binary_to_term2(Config) when is_list(Config) ->
     ?line bad_bin_to_term(<<131,100,0,14,"undefined_atom">>, [safe]),
     ?line bad_bin_to_term(<<131,100,0,14,"other_bad_atom">>, [safe]),
@@ -631,7 +625,6 @@ safe_binary_to_term2(Config) when is_list(Config) ->
 
 %% Tests bad input to binary_to_term/1.
 
-bad_terms(suite) -> [];
 bad_terms(Config) when is_list(Config) ->
     ?line test_terms(fun corrupter/1),
     {'EXIT',{badarg,_}} = (catch binary_to_term(<<131,$M,3:32,0,11,22,33>>)),
@@ -695,7 +688,6 @@ corrupter(Bin, Pos) when Pos >= 0 ->
 corrupter(_Bin, _) ->
     ok.
 
-more_bad_terms(suite) -> [];
 more_bad_terms(Config) when is_list(Config) ->
     ?line Data = proplists:get_value(data_dir, Config),
     ?line BadFile = filename:join(Data, "bad_binary"),
@@ -934,8 +926,7 @@ otp_6817_try_bin(Bin) ->
     %% Will crash if the bug is present.
     erlang:garbage_collect().
 
-otp_8117(doc) -> "Some bugs in binary_to_term when 32-bit integers are negative.";
-otp_8117(suite) -> [];
+%% Some bugs in binary_to_term when 32-bit integers are negative.
 otp_8117(Config) when is_list(Config) ->
     [otp_8117_do(Op,-(1 bsl N)) || Op <- ['fun',named_fun,list,tuple],
 				   N <- lists:seq(0,31)],
@@ -959,8 +950,7 @@ otp_8117_do(tuple,Neg) ->
     ?line bad_bin_to_term(<<131,104,2,105,Neg:32,97,11,97,12,97,13,97,14>>).
     
 
-ordering(doc) -> "Tests ordering of binaries.";
-ordering(suite) -> [];
+%% Tests ordering of binaries.
 ordering(Config) when is_list(Config) ->
     B1 = list_to_binary([7,8,9]),
     B2 = make_sub_binary([1,2,3,4]),
diff --git a/erts/emulator/test/bs_construct_SUITE.erl b/erts/emulator/test/bs_construct_SUITE.erl
index bc5fb4f379..9a9066d0f0 100644
--- a/erts/emulator/test/bs_construct_SUITE.erl
+++ b/erts/emulator/test/bs_construct_SUITE.erl
@@ -249,7 +249,6 @@ fail_check(Res, _, _) ->
     ct:fail(did_not_fail_in_compiled_code).
 
 %%% Simple working cases
-test1(suite) -> [];
 test1(Config) when is_list(Config) ->
     ?line I_13 = i(13),
     ?line I_big1 = big(1),
@@ -271,7 +270,6 @@ gen(N, S, A) ->
 gen_l(N, S, A) ->
     [?T(<<A:S/little, A:(N-S)/little>>, comp(N, A, S))].
 
-test2(suite) -> [];
 test2(Config) when is_list(Config) ->
     ?line test2(0, 8, 2#10101010101010101),
     ?line test2(0, 8, 2#1111111111).
@@ -299,7 +297,6 @@ t3() ->
      ?N(<<>>)
     ].
 
-test3(suite) -> [];
 test3(Config) when is_list(Config) ->
     ?line Vars = [],
     ?line lists:foreach(fun one_test/1, eval_list(t3(), Vars)).
@@ -310,7 +307,6 @@ gen_u(N, S, A) ->
 gen_u_l(N, S, A) ->
     [?N(<<A:S/little, A:(N-S)/little>>)].
 
-test4(suite) -> [];
 test4(Config) when is_list(Config) ->
     ?line test4(0, 16, 2#10101010101010101),
     ?line test4(0, 16, 2#1111111111).
@@ -331,8 +327,7 @@ gen_b(N, S, A) ->
     [?T(<<A:S/binary-unit:1, A:(N-S)/binary-unit:1>>,
 	binary_to_list(<<A:S/binary-unit:1, A:(N-S)/binary-unit:1>>))].
 
-test5(suite) -> [];
-test5(doc) -> ["OTP-3995"];
+%% OTP-3995
 test5(Config) when is_list(Config) ->
     ?line test5(0, 8, <<73>>),
     ?line test5(0, 8, <<68>>).
@@ -349,7 +344,6 @@ test5(S, A) ->
     lists:foreach(fun one_test/1, eval_list(gen_b(N, S, A), Vars)).
 
 %%% Failure cases
-testf(suite) -> [];
 testf(Config) when is_list(Config) ->
     ?line ?FAIL(<<3.14>>),
     ?line ?FAIL(<<<<1,2>>>>),
@@ -399,8 +393,7 @@ testf_1(W, B) ->
     ?FAIL_VARS(<<3.14:W/float>>, Vars),
     ?FAIL_VARS(<<B:W/binary>>, [{'B',B}|Vars]).
 
-not_used(doc) ->
-    "Test that constructed binaries that are not used will still give an exception.";
+%% Test that constructed binaries that are not used will still give an exception.
 not_used(Config) when is_list(Config) ->
     ?line ok = not_used1(3, <<"dum">>),
     ?line {'EXIT',{badarg,_}} = (catch not_used1(3, "dum")),
@@ -440,7 +433,7 @@ in_guard(Bin, A, B) when <<A:14,B/float,3:2>> == Bin -> 3;
 in_guard(Bin, A, B) when {a,b,<<A:14,B/float,3:2>>} == Bin -> cant_happen;
 in_guard(_, _, _) -> nope.
 
-mem_leak(doc) -> "Make sure that construction has no memory leak";
+%% Make sure that construction has no memory leak
 mem_leak(Config) when is_list(Config) ->
     ?line B = make_bin(16, <<0>>),
     ?line mem_leak(1024, B),
diff --git a/erts/emulator/test/bs_match_bin_SUITE.erl b/erts/emulator/test/bs_match_bin_SUITE.erl
index 2185e43498..7b82485216 100644
--- a/erts/emulator/test/bs_match_bin_SUITE.erl
+++ b/erts/emulator/test/bs_match_bin_SUITE.erl
@@ -47,7 +47,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-byte_split_binary(doc) -> "Tries to split a binary at all byte-aligned positions.";
+%% Tries to split a binary at all byte-aligned positions.
 byte_split_binary(Config) when is_list(Config) ->
     ?line L = lists:seq(0, 57),
     ?line B = mkbin(L),
@@ -64,7 +64,7 @@ byte_split(L, B, Pos) when Pos >= 0 ->
     ?line byte_split(L, B, Pos-1);
 byte_split(_, _, _) -> ok.
 
-bit_split_binary(doc) -> "Tries to split a binary at all positions.";
+%% Tries to split a binary at all positions.
 bit_split_binary(Config) when is_list(Config) ->
     Fun = fun(Bin, List, SkipBef, N) ->
 		  ?line SkipAft = 8*size(Bin) - N - SkipBef,
diff --git a/erts/emulator/test/bs_match_int_SUITE.erl b/erts/emulator/test/bs_match_int_SUITE.erl
index 6f8a5b1916..562aeef6f6 100644
--- a/erts/emulator/test/bs_match_int_SUITE.erl
+++ b/erts/emulator/test/bs_match_int_SUITE.erl
@@ -130,7 +130,7 @@ dynamic(Bin, S1, S2, A, B) ->
 	_Other -> erlang:error(badmatch, [Bin,S1,S2,A,B])
     end.
 
-more_dynamic(doc) -> "Extract integers at different alignments and of different sizes.";
+%% Extract integers at different alignments and of different sizes.
 more_dynamic(Config) when is_list(Config) ->
 
     % Unsigned big-endian numbers.
diff --git a/erts/emulator/test/bs_match_misc_SUITE.erl b/erts/emulator/test/bs_match_misc_SUITE.erl
index 8979a69322..f32f012085 100644
--- a/erts/emulator/test/bs_match_misc_SUITE.erl
+++ b/erts/emulator/test/bs_match_misc_SUITE.erl
@@ -39,7 +39,7 @@ all() ->
      otp_7198, unordered_bindings, float_middle_endian].
 
 
-bound_var(doc) -> "Test matching of bound variables.";
+%% Test matching of bound variables.
 bound_var(Config) when is_list(Config) ->
     ?line ok = bound_var(42, 13, <<42,13>>),
     ?line nope = bound_var(42, 13, <<42,255>>),
@@ -49,7 +49,7 @@ bound_var(Config) when is_list(Config) ->
 bound_var(A, B, <<A:8,B:8>>) -> ok;
 bound_var(_, _, _) -> nope.
 
-bound_tail(doc) -> "Test matching of a bound tail.";
+%% Test matching of a bound tail.
 bound_tail(Config) when is_list(Config) ->
     ?line ok = bound_tail(<<>>, <<13,14>>),
     ?line ok = bound_tail(<<2,3>>, <<1,1,2,3>>),
diff --git a/erts/emulator/test/bs_match_tail_SUITE.erl b/erts/emulator/test/bs_match_tail_SUITE.erl
index baa86e6d4a..20129e3556 100644
--- a/erts/emulator/test/bs_match_tail_SUITE.erl
+++ b/erts/emulator/test/bs_match_tail_SUITE.erl
@@ -47,7 +47,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-aligned(doc) -> "Test aligned tails.";
+%% Test aligned tails.
 aligned(Config) when is_list(Config) ->
     ?line Tail1 = mkbin([]),
     ?line {258,Tail1} = al_get_tail_used(mkbin([1,2])),
@@ -70,7 +70,7 @@ aligned(Config) when is_list(Config) ->
 al_get_tail_used(<<A:16,T/binary>>) -> {A,T}.
 al_get_tail_unused(<<A:16,_/binary>>) -> A.
 
-unaligned(doc) -> "Test that an non-aligned tail cannot be matched out.";
+%% Test that an non-aligned tail cannot be matched out.
 unaligned(Config) when is_list(Config) ->
     ?line {'EXIT',{function_clause,_}} = (catch get_tail_used(mkbin([42]))),
     ?line {'EXIT',{{badmatch,_},_}} = (catch get_dyn_tail_used(mkbin([137]), 3)),
@@ -90,7 +90,7 @@ get_dyn_tail_unused(Bin, Sz) ->
     <<A:Sz,_/binary>> = Bin,
     A.
 
-zero_tail(doc) -> "Test that zero tails are tested correctly.";
+%% Test that zero tails are tested correctly.
 zero_tail(Config) when is_list(Config) ->
     ?line 7 = (catch test_zero_tail(mkbin([7]))),
     ?line {'EXIT',{function_clause,_}} = (catch test_zero_tail(mkbin([1,2]))),
diff --git a/erts/emulator/test/busy_port_SUITE.erl b/erts/emulator/test/busy_port_SUITE.erl
index ee82356646..ce9fdfa10d 100644
--- a/erts/emulator/test/busy_port_SUITE.erl
+++ b/erts/emulator/test/busy_port_SUITE.erl
@@ -62,7 +62,6 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 %% Tests I/O operations to a busy port, to make sure a suspended send
 %% operation is correctly restarted.  This used to crash Beam.
 
-io_to_busy(suite) -> [];
 io_to_busy(Config) when is_list(Config) ->
     ct:timetrap({seconds, 30}),
 
@@ -114,7 +113,6 @@ forget(_) ->
 %% Test the interaction of busy ports and message sending.
 %% This used to cause the wrong message to be received.
 
-message_order(suite) -> {req, dynamic_loading};
 message_order(Config) when is_list(Config) ->
     ct:timetrap({seconds, 10}),
 
@@ -146,8 +144,6 @@ send_to_busy_1(Parent) ->
     end.
 
 %% Test the bif send/3
-send_3(suite) -> {req,dynamic_loading};
-send_3(doc) -> ["Test the BIF send/3"];
 send_3(Config) when is_list(Config) ->
     ct:timetrap({seconds, 10}),
     %%
@@ -165,8 +161,6 @@ send_3(Config) when is_list(Config) ->
     ok.
 
 %% Test the erlang:system_monitor(Pid, [busy_port])
-system_monitor(suite) -> {req,dynamic_loading};
-system_monitor(doc) -> ["Test erlang:system_monitor({Pid,[busy_port]})."];
 system_monitor(Config) when is_list(Config) ->
     ct:timetrap({seconds, 10}),
     ?line Self = self(),
@@ -222,7 +216,6 @@ rec(Tag) ->
 %%
 %% tests that the suspended process is killed if the port is killed.
 
-no_trap_exit(suite) -> [];
 no_trap_exit(Config) when is_list(Config) ->
     ct:timetrap({seconds, 10}),
     ?line process_flag(trap_exit, true),
@@ -246,7 +239,6 @@ no_trap_exit(Config) when is_list(Config) ->
 %% The same scenario as above, but the port has been explicitly
 %% unlinked from the process.
 
-no_trap_exit_unlinked(suite) -> [];
 no_trap_exit_unlinked(Config) when is_list(Config) ->
     ct:timetrap({seconds, 10}),
     ?line process_flag(trap_exit, true),
@@ -291,7 +283,6 @@ no_trap_exit_process(ResultTo, Link, Config) ->
 %% tests that the suspended process is scheduled runnable and
 %% receives an 'EXIT' message if the port is killed.
 
-trap_exit(suite) -> [];
 trap_exit(Config) when is_list(Config) ->
     ct:timetrap({seconds, 10}),
     ?line Pid = fun_spawn(fun busy_port_exit_process/2, [self(), Config]),
@@ -332,7 +323,6 @@ busy_port_exit_process(ResultTo, Config) ->
 %% This should work even if some of the processes have terminated
 %% in the meantime.
 
-multiple_writers(suite) -> [];
 multiple_writers(Config) when is_list(Config) ->
     ct:timetrap({seconds, 10}),
     ?line start_busy_driver(Config),
diff --git a/erts/emulator/test/call_trace_SUITE.erl b/erts/emulator/test/call_trace_SUITE.erl
index 6035de9d75..0ced026c73 100644
--- a/erts/emulator/test/call_trace_SUITE.erl
+++ b/erts/emulator/test/call_trace_SUITE.erl
@@ -78,9 +78,7 @@ hipe(Config) when is_list(Config) ->
     ?line AllFuncs = erlang:trace_pattern({'_','_','_'}, false),
     ok.
 
-process_specs(doc) ->
-    "Tests 'all', 'new', and 'existing' for specifying processes.";
-process_specs(suite) -> [];
+%% Tests 'all', 'new', and 'existing' for specifying processes.
 process_specs(Config) when is_list(Config) ->
     ?line Tracer = start_tracer(),
     ?line {flags,[call]} = trace_info(self(), flags),
@@ -268,8 +266,8 @@ foo(X, Y) -> X+Y.
 %% This test case was written to verify that we do not change
 %% any behaviour with the introduction of "block-free" upgrade in R16.
 %% In short: Do not refer to this test case as an authority of how it must work.
-upgrade(doc) ->
-    "Test tracing on module being upgraded";
+
+%% Test tracing on module being upgraded
 upgrade(Config) when is_list(Config) ->
     V1 = compile_version(my_upgrade_test, 1, Config),
     V2 = compile_version(my_upgrade_test, 2, Config),
@@ -470,8 +468,7 @@ flag_test_cpu_timestamp(Test) ->
 	error:badarg -> ok
     end.
 
-errors(doc) -> "Test bad arguments for trace/3 and trace_pattern/3.";
-errors(suite) -> [];
+%% Test bad arguments for trace/3 and trace_pattern/3.
 errors(Config) when is_list(Config) ->
     ?line expect_badarg_pid(aaa, true, []),
     ?line expect_badarg_pid({pid,dum}, false, []),
@@ -505,8 +502,7 @@ expect_badarg_func(MFA, Pattern) ->
 	    ct:fail({unexpected,Other})
     end.
 
-pam(doc) -> "Basic test of PAM.";
-pam(suite) -> [];
+%% Basic test of PAM.
 pam(Config) when is_list(Config) ->
     ?line start_tracer(),
     ?line Self = self(),
@@ -737,8 +733,7 @@ exception_trace() ->
     ?line {save,me} = X,
     ok.
 
-on_load(doc) -> "Test the on_load argument for trace_pattern/3.";
-on_load(suite) -> [];
+%% Test the on_load argument for trace_pattern/3.
 on_load(Config) when is_list(Config) ->
     ?line 0 = erlang:trace_pattern(on_load, []),
     ?line {traced,global} = erlang:trace_info(on_load, traced),
@@ -764,8 +759,7 @@ on_load(Config) when is_list(Config) ->
 
 
 
-deep_exception(doc) -> "Test the new exception trace.";
-deep_exception(suite) -> [];
+%% Test the new exception trace.
 deep_exception(Config) when is_list(Config) ->
     deep_exception().
 
@@ -1049,8 +1043,7 @@ deep_expect_N(_Self, 0, exception_from, R) ->
 
 
 
-exception_nocatch(doc) -> "Test the new exception trace.";
-exception_nocatch(suite) -> [];
+%% Test the new exception trace.
 exception_nocatch(Config) when is_list(Config) ->
     exception_nocatch().
 
diff --git a/erts/emulator/test/code_SUITE.erl b/erts/emulator/test/code_SUITE.erl
index 0c09fe6f7b..f917dc92eb 100644
--- a/erts/emulator/test/code_SUITE.erl
+++ b/erts/emulator/test/code_SUITE.erl
@@ -239,8 +239,7 @@ gc() ->
     gc1().
 gc1() -> ok.
 
-t_check_process_code_ets(doc) ->
-    "Test check_process_code/2 in combination with a fun obtained from an ets table.";
+%% Test check_process_code/2 in combination with a fun obtained from an ets table.
 t_check_process_code_ets(Config) when is_list(Config) ->
     case test_server:is_native(?MODULE) of
 	true ->
diff --git a/erts/emulator/test/crypto_SUITE.erl b/erts/emulator/test/crypto_SUITE.erl
index e9498028cb..8ff77b3880 100644
--- a/erts/emulator/test/crypto_SUITE.erl
+++ b/erts/emulator/test/crypto_SUITE.erl
@@ -33,10 +33,7 @@ all() ->
     [t_md5, t_md5_update, error, unaligned_context,
      random_lists, misc_errors].
 
-misc_errors(doc) ->
-    ["Test crc32, adler32 and md5 error cases not covered by other tests"];
-misc_errors(suite) ->
-    [];
+%% Test crc32, adler32 and md5 error cases not covered by other tests"
 misc_errors(Config) when is_list(Config) ->
     ct:timetrap({minutes, 2}),
     ?line 1 = erlang:adler32([]),
@@ -108,11 +105,7 @@ collect_workers([{L,{Pid,Ref}}|T]) ->
 	    exit({error_at_line,L,Other})
     end.
 
-random_lists(doc) ->
-    ["Test crc32, adler32 and md5 on a number of pseudo-randomly generated "
-     "lists."];
-random_lists(suite) ->
-    [];
+%% Test crc32, adler32 and md5 on a number of pseudo-randomly generated lists.
 random_lists(Config) when is_list(Config) ->
     ct:timetrap({minutes, 5}),
     ?line Num = erlang:system_info(schedulers_online),
@@ -216,11 +209,7 @@ random_lists(Config) when is_list(Config) ->
     ?line run_in_para(Wlist1,Num),
     ok.
 
-%%
-%%
-t_md5(doc) ->
-    ["Generate MD5 message digests and check the result. Examples are "
-     "from RFC-1321."];
+%% Generate MD5 message digests and check the result. Examples are from RFC-1321.
 t_md5(Config) when is_list(Config) ->
     ?line t_md5_test("", "d41d8cd98f00b204e9800998ecf8427e"),
     ?line t_md5_test("a", "0cc175b9c0f1b6a831c399e269772661"),
@@ -238,11 +227,8 @@ t_md5(Config) when is_list(Config) ->
 	    "57edf4a22be3c955ac49da2e2107b67a"),
     ok.
 
-%%
-%%
-t_md5_update(doc) ->
-    ["Generate MD5 message using md5_init, md5_update, and md5_final, and"
-     "check the result. Examples are from RFC-1321."];
+%% Generate MD5 message using md5_init, md5_update, and md5_final, and
+%% check the result. Examples are from RFC-1321.
 t_md5_update(Config) when is_list(Config) ->
     ?line t_md5_update_1(fun(Str) -> Str end),
     ?line t_md5_update_1(fun(Str) -> list_to_binary(Str) end),
diff --git a/erts/emulator/test/ddll_SUITE.erl b/erts/emulator/test/ddll_SUITE.erl
index 5ef751a4cd..54791bfa45 100644
--- a/erts/emulator/test/ddll_SUITE.erl
+++ b/erts/emulator/test/ddll_SUITE.erl
@@ -71,10 +71,7 @@ all() ->
      no_trap_exit_and_kill_ports, monitor_demonitor,
      monitor_demonitor_load, new_interface, lock_driver].
 
-unload_on_process_exit(suite) ->
-    [];
-unload_on_process_exit(doc) ->
-    ["Check that the driver is unloaded on process exit"];
+%% Check that the driver is unloaded on process exit
 unload_on_process_exit(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line false = lists:member("echo_drv",element(2,erl_ddll:loaded_drivers())),
@@ -103,10 +100,7 @@ unload_on_process_exit(Config) when is_list(Config) ->
     ?line false = lists:member("echo_drv",element(2,erl_ddll:loaded_drivers())),
     ok.
 
-delayed_unload_with_ports(suite) ->
-    [];
-delayed_unload_with_ports(doc) ->
-    ["Check that the driver is unloaded when the last port is closed"];
+%% Check that the driver is unloaded when the last port is closed
 delayed_unload_with_ports(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line erl_ddll:try_load(Path, echo_drv, []),
@@ -126,10 +120,7 @@ delayed_unload_with_ports(Config) when is_list(Config) ->
     ?line ok = receive {'DOWN', Ref, driver, echo_drv, unloaded} -> ok after 1000 -> false end,
     ok.
 
-unload_due_to_process_exit(suite) ->
-    [];
-unload_due_to_process_exit(doc) ->
-    ["Check that the driver with ports is unloaded on process exit"];
+%% Check that the driver with ports is unloaded on process exit
 unload_due_to_process_exit(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
@@ -158,10 +149,7 @@ unload_due_to_process_exit(Config) when is_list(Config) ->
     ?line ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
     ok.
 
-no_unload_due_to_process_exit(suite) ->
-    [];
-no_unload_due_to_process_exit(doc) ->
-    ["Check that a driver with driver loaded in another process is not unloaded on process exit"];
+%% Check that a driver with driver loaded in another process is not unloaded on process exit
 no_unload_due_to_process_exit(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
@@ -193,10 +181,7 @@ no_unload_due_to_process_exit(Config) when is_list(Config) ->
     ?line ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
     ok.
 
-no_unload_due_to_process_exit_2(suite) ->
-    [];
-no_unload_due_to_process_exit_2(doc) ->
-    ["Check that a driver with open ports in another process is not unloaded on process exit"];
+%% Check that a driver with open ports in another process is not unloaded on process exit
 no_unload_due_to_process_exit_2(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
@@ -228,10 +213,7 @@ no_unload_due_to_process_exit_2(Config) when is_list(Config) ->
     ?line ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
     ok.
 
-unload_reload_thingie(suite) ->
-    [];
-unload_reload_thingie(doc) ->
-    ["Check delayed unload and reload"];
+%% Check delayed unload and reload
 unload_reload_thingie(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
@@ -271,10 +253,7 @@ unload_reload_thingie(Config) when is_list(Config) ->
     ?line ok = receive X -> {error, X} after 300 -> ok end,
     ok.
 
-unload_reload_thingie_2(suite) ->
-    [];
-unload_reload_thingie_2(doc) ->
-    ["Check delayed unload and reload"];
+%% Check delayed unload and reload
 unload_reload_thingie_2(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
@@ -313,10 +292,7 @@ unload_reload_thingie_2(Config) when is_list(Config) ->
     ?line ok = receive X -> {error, X} after 300 -> ok end,
     ok.
 
-unload_reload_thingie_3(suite) ->
-    [];
-unload_reload_thingie_3(doc) ->
-    ["Check delayed unload and reload failure"];
+%% Check delayed unload and reload failure
 unload_reload_thingie_3(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
@@ -357,8 +333,7 @@ unload_reload_thingie_3(Config) when is_list(Config) ->
     ?line ok = receive X -> {error, X} after 300 -> ok end,
     ok.
 
-reload_pending(suite) -> [];
-reload_pending(doc) -> ["Reload a driver that is pending on a user"];
+%% Reload a driver that is pending on a user
 reload_pending(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
@@ -407,8 +382,7 @@ reload_pending(Config) when is_list(Config) ->
     ?line ok = receive Z -> {error, Z} after 300 -> ok end,
     ok.
 
-load_fail_init(suite) -> [];
-load_fail_init(doc) -> ["Tests failure in the init in driver struct."];
+%% Tests failure in the init in driver struct.
 load_fail_init(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line PathFailing = proplists:get_value(priv_dir, Config),
@@ -433,8 +407,7 @@ load_fail_init(Config) when is_list(Config) ->
     ok.
 
 
-reload_pending_fail_init(suite) -> [];
-reload_pending_fail_init(doc) -> ["Reload a driver that is pending but init fails"];
+%% Reload a driver that is pending but init fails
 reload_pending_fail_init(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line PathFailing = proplists:get_value(priv_dir, Config),
@@ -491,9 +464,7 @@ reload_pending_fail_init(Config) when is_list(Config) ->
     ?line ok = receive Z -> {error, Z} after 300 -> ok end,
     ok.
 
-reload_pending_kill(suite) -> [];
-reload_pending_kill(doc) -> ["Reload a driver with kill_ports option "
-			     "that is pending on a user"];
+%% Reload a driver with kill_ports option that is pending on a user
 reload_pending_kill(Config) when is_list(Config) ->
     ?line OldFlag = process_flag(trap_exit,true),
     ?line Path = proplists:get_value(data_dir, Config),
@@ -584,20 +555,14 @@ reload_pending_kill(Config) when is_list(Config) ->
     ok.
 
 
-more_error_codes(suite) ->
-    [];
-more_error_codes(doc) ->
-    ["Some more error code checking"];
+%% Some more error code checking
 more_error_codes(Config) when is_list(Config) ->
     ?line {error,Err} = erl_ddll:try_load("./echo_dr",echo_dr,[]),
     ?line true = is_list(erl_ddll:format_error(Err)),
     ?line true = is_list(erl_ddll:format_error(not_loaded)),
     ok.
 
-forced_port_killing(suite) ->
-    [];
-forced_port_killing(doc) ->
-    ["Check kill_ports option to try_unload "];
+%% Check kill_ports option to try_unload
 forced_port_killing(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line OldFlag=process_flag(trap_exit,true),
@@ -628,10 +593,7 @@ forced_port_killing(Config) when is_list(Config) ->
     ?line ok = receive X -> {error, X} after 300 -> ok end,
     ok.
 
-no_trap_exit_and_kill_ports(suite) ->
-    [];
-no_trap_exit_and_kill_ports(doc) ->
-    ["Check delayed unload and reload with no trap_exit"];
+%% Check delayed unload and reload with no trap_exit
 no_trap_exit_and_kill_ports(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
@@ -667,10 +629,7 @@ no_trap_exit_and_kill_ports(Config) when is_list(Config) ->
     ?line process_flag(trap_exit,OldFlag),
     ok.
 
-monitor_demonitor(suite) ->
-    [];
-monitor_demonitor(doc) ->
-    ["Check monitor and demonitor of drivers"];
+%% Check monitor and demonitor of drivers
 monitor_demonitor(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line erl_ddll:try_load(Path, echo_drv, []),
@@ -683,10 +642,7 @@ monitor_demonitor(Config) when is_list(Config) ->
     ?line ok = receive _ -> error after 300 -> ok end,
     ok.
 
-monitor_demonitor_load(suite) ->
-    [];
-monitor_demonitor_load(doc) ->
-    ["Check monitor/demonitor of driver loading"];
+%% Check monitor/demonitor of driver loading
 monitor_demonitor_load(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line {ok,loaded} = erl_ddll:try_load(Path, echo_drv, []),
@@ -712,10 +668,7 @@ monitor_demonitor_load(Config) when is_list(Config) ->
     ?line ok = unload_expect_fast(echo_drv,[]),
     ok.
 
-new_interface(suite) ->
-    [];
-new_interface(doc) ->
-    ["Test the new load/unload/reload interface"];
+%% Test the new load/unload/reload interface
 new_interface(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     % Typical scenario
@@ -834,10 +787,9 @@ errors(Config) when is_list(Config) ->
     ?line {ok, L1} = erl_ddll:loaded_drivers(),
     ok.
 
-reference_count(doc) ->
-    ["Check that drivers are unloaded when their reference count ",
-     "reaches zero, and that they cannot be unloaded while ",
-     "they are still referenced."];
+%% Check that drivers are unloaded when their reference count
+%% reaches zero, and that they cannot be unloaded while
+%% they are still referenced.
 reference_count(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
 
@@ -877,9 +829,8 @@ nice_echo_loader(Path, Starter) ->
     end.
 
 
-kill_port(doc) ->
-    ["Test that a port that uses a driver is killed when the ",
-     "process that loaded the driver dies."];
+%% Test that a port that uses a driver is killed when the
+%% process that loaded the driver dies.
 kill_port(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
 
@@ -912,9 +863,8 @@ kill_port(Config) when is_list(Config) ->
     end,
     ok.
 
-dont_kill_port(doc) ->
-    ["Test that a port that uses a driver is not killed when the ",
-     "process that loaded the driver dies and it's nicely opened."];
+%% Test that a port that uses a driver is not killed when the
+%% process that loaded the driver dies and it's nicely opened.
 dont_kill_port(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
 
@@ -951,8 +901,8 @@ dont_kill_port(Config) when is_list(Config) ->
     end,
     ok.
 
-properties(doc) -> ["Test that a process that loaded a driver ",
-		    "is the only process that can unload it."];
+%% Test that a process that loaded a driver
+%% is the only process that can unload it.
 properties(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
 
@@ -978,7 +928,7 @@ properties(Config) when is_list(Config) ->
     ?line test_server:sleep(200),   % Give time to unload.
     ok.
 
-load_and_unload(doc) -> ["Load two drivers and unload them in load order."];
+%% Load two drivers and unload them in load order.
 load_and_unload(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line {ok, Loaded_drivers1} = erl_ddll:loaded_drivers(),
@@ -993,10 +943,7 @@ load_and_unload(Config) when is_list(Config) ->
     ?line [] = ordsets:to_list(ordsets:subtract(Set2, Set1)),
     ok.    
 
-lock_driver(suite) ->
-    [];
-lock_driver(doc) ->
-    ["Check multiple calls to driver_lock_driver"];
+%% Check multiple calls to driver_lock_driver
 lock_driver(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line {ok, _} = erl_ddll:try_load(Path, lock_drv, []),
diff --git a/erts/emulator/test/decode_packet_SUITE.erl b/erts/emulator/test/decode_packet_SUITE.erl
index 213234af52..08e2448146 100644
--- a/erts/emulator/test/decode_packet_SUITE.erl
+++ b/erts/emulator/test/decode_packet_SUITE.erl
@@ -48,8 +48,6 @@ init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
 end_per_testcase(_Func, _Config) ->
     ok.
 
-basic(doc) -> [];
-basic(suite) -> [];
 basic(Config) when is_list(Config) ->
     ?line Packet = <<101,22,203,54,175>>,
     ?line Rest = <<123,34,0,250>>,
@@ -213,8 +211,6 @@ pack_ssl(Content, Major, Minor, Body) ->
     {Res, {ssl_tls,[],C,{Major,Minor}, Data}}.
 
 
-packet_size(doc) -> [];
-packet_size(suite) -> [];
 packet_size(Config) when is_list(Config) ->
     ?line Packet = <<101,22,203,54,175>>,
     ?line Rest = <<123,34,0,250>>,
@@ -264,8 +260,6 @@ packet_size(Config) when is_list(Config) ->
     ok.
 
 
-neg(doc) -> [];
-neg(suite) -> [];
 neg(Config) when is_list(Config) ->
     ?line Bin = <<"dummy">>,
     Fun = fun()->dummy end,
@@ -294,8 +288,6 @@ neg(Config) when is_list(Config) ->
     ok.
 
 
-http(doc) -> [];
-http(suite) -> [];
 http(Config) when is_list(Config) ->
     ?line <<"foo">> = http_do(http_request("foo")),
     ?line <<" bar">> = http_do(http_request(" bar")),
@@ -472,8 +464,6 @@ http_uri_variants() ->
      {"something_else", "something_else", <<"something_else">>}].
 
 
-line(doc) -> [];
-line(suite) -> [];
 line(Config) when is_list(Config) ->
     Text = <<"POST /invalid/url HTTP/1.1\r\n"
 	    "Connection: close\r\n"
@@ -524,8 +514,6 @@ find_in_binary(Byte, Bin) ->
 	P -> P
     end.    
 
-ssl(doc) -> [];
-ssl(suite) -> [];
 ssl(Config) when is_list(Config) ->
     Major = 34,
     Minor = 17,
@@ -541,7 +529,7 @@ ssl(Config) when is_list(Config) ->
     F(v2hello),
     ok.
 
-otp_8536(doc) -> ["Corrupt sub-binary-strings from httph_bin"];
+%% Corrupt sub-binary-strings from httph_bin
 otp_8536(Config) when is_list(Config) ->
     lists:foreach(fun otp_8536_do/1, lists:seq(1,50)),
     ok.
@@ -570,8 +558,7 @@ decode_pkt(Type,Bin,Opts) ->
     %%io:format(" -> ~p\n",[Res]),
     Res.
 
-otp_9389(doc) -> ["Verify line_length works correctly for HTTP headers"];
-otp_9389(suite) -> [];
+%% Verify line_length works correctly for HTTP headers
 otp_9389(Config) when is_list(Config) ->
     Opts = [{packet_size, 16384}, {line_length, 3000}],
     Pkt = list_to_binary(["GET / HTTP/1.1\r\nHost: localhost\r\nLink: /",
@@ -590,8 +577,7 @@ otp_9389(Config) when is_list(Config) ->
         erlang:decode_packet(httph, Rest3, Opts),
     ok.
 
-otp_9389_line(doc) -> ["Verify packet_size works correctly for line mode"];
-otp_9389_line(suite) -> [];
+%% Verify packet_size works correctly for line mode
 otp_9389_line(Config) when is_list(Config) ->
     Opts = [{packet_size, 20}],
     Line1 = <<"0123456789012345678\n">>,
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index e341d4ab2b..d4d70632c2 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -89,8 +89,7 @@ groups() ->
       [bad_dist_ext_receive, bad_dist_ext_process_info,
        bad_dist_ext_control, bad_dist_ext_connection_id]}].
 
-ping(doc) ->
-    ["Tests pinging a node in different ways."];
+%% Tests pinging a node in different ways.
 ping(Config) when is_list(Config) ->
     Times = 1024,
 
@@ -250,13 +249,10 @@ receiver(Terms, Size) ->
 
 
 
-local_send_big(doc) ->
-    ["Sends several big message to an non-registered process on ",
-     "the local node."];
+%% Sends several big message to an non-registered process on the local node.
 local_send_big(Config) when is_list(Config) ->
-    Data0=local_send_big(doc)++
-	["Tests sending small and big messages to a non-existing ",
-        "local registered process."],
+    Data0= ["Tests sending small and big messages to a non-existing ",
+            "local registered process."],
     Data1=[Data0,[Data0, Data0, [Data0], Data0],Data0],
     Data2=Data0++lists:flatten(Data1)++
 	list_to_binary(lists:flatten(Data1)),
@@ -264,21 +260,18 @@ local_send_big(Config) when is_list(Config) ->
     ?line test_server:do_times(4096, Func),
     ok.
 
-local_send_small(doc) ->
-    ["Sends a small message to an non-registered process on the ",
-     "local node."];
+%% Sends a small message to an non-registered process on the local node.
 local_send_small(Config) when is_list(Config) ->
     Data={some_stupid, "arbitrary", 'Data'},
     Func=fun() -> Data= {unregistered_name, node()} ! Data end,
     ?line test_server:do_times(4096, Func),
     ok.
 
-local_send_legal(doc) ->
-    ["Sends data to a registered process on the local node, ",
-     "as if it was on another node."];
+%% Sends data to a registered process on the local node, as if it was on another node.
 local_send_legal(Config) when is_list(Config) ->
     Times=16384,
-    Data={local_send_legal(doc), local_send_legal(doc)},
+    Txt = "Some Not so random Data",
+    Data={[Txt,Txt,Txt], [Txt,Txt,Txt]},
     Pid=spawn(?MODULE,receiver2, [0, 0]) ,
     ?line true=register(registered_process, Pid),
 
@@ -306,7 +299,7 @@ receiver2(Num, TotSize) ->
 	    receiver2(Num+1, TotSize+size(Stuff))
     end.
 
-link_to_busy(doc) -> "Test that link/1 to a busy distribution port works.";
+%% Test that link/1 to a busy distribution port works.
 link_to_busy(Config) when is_list(Config) ->
     ct:timetrap({seconds, 60}),
     ?line {ok, Node} = start_node(link_to_busy),
@@ -352,7 +345,7 @@ applied_linker(Pid) ->
 tail_applied_linker(Pid) ->
     apply(erlang, link, [Pid]).
     
-exit_to_busy(doc) -> "Test that exit/2 to a busy distribution port works.";
+%% Test that exit/2 to a busy distribution port works.
 exit_to_busy(Config) when is_list(Config) ->
     ct:timetrap({seconds, 60}),
     ?line {ok, Node} = start_node(exit_to_busy),
@@ -509,9 +502,8 @@ sink1() ->
 	_Any -> sink1()
     end.
 
-lost_exit(doc) ->
-    "Test that EXIT and DOWN messages send to another node are not lost if "
-	"the distribution port is busy.";
+%% Test that EXIT and DOWN messages send to another node are not lost if
+%% the distribution port is busy.
 lost_exit(Config) when is_list(Config) ->
     ?line {ok, Node} = start_node(lost_exit),
 
@@ -575,9 +567,8 @@ dummy_waiter() ->
 	    ok
     end.
 
-link_to_dead(doc) ->
-    ["Test that linking to a dead remote process gives an EXIT message ",
-     "AND that the link is teared down."];
+%% Test that linking to a dead remote process gives an EXIT message
+%% AND that the link is teared down.
 link_to_dead(Config) when is_list(Config) ->
     ?line process_flag(trap_exit, true),
     ?line {ok, Node} = start_node(link_to_dead),
@@ -611,9 +602,8 @@ link_to_dead(Config) when is_list(Config) ->
 dead_process() ->
     erlang:error(die).
 
-link_to_dead_new_node(doc) ->
-    ["Test that linking to a pid on node that has gone and restarted gives ",
-     "the correct EXIT message (OTP-2304)."];
+%% Test that linking to a pid on node that has gone and restarted gives
+%% the correct EXIT message (OTP-2304).
 link_to_dead_new_node(Config) when is_list(Config) ->
     ?line process_flag(trap_exit, true),
 
@@ -647,8 +637,7 @@ link_to_dead_new_node(Config) when is_list(Config) ->
 	  end,
     ok.
 
-applied_monitor_node(doc) ->
-    "Test that monitor_node/2 works when applied.";
+%% Test that monitor_node/2 works when applied.
 applied_monitor_node(Config) when is_list(Config) ->
     ?line NonExisting = list_to_atom("__non_existing__@" ++ hostname()),
 
@@ -668,9 +657,8 @@ applied_monitor_node(Config) when is_list(Config) ->
 tail_apply(M, F, A) ->
     apply(M, F, A).
 
-ref_port_roundtrip(doc) ->
-    "Test that sending a port or reference to another node and back again "
-	"doesn't correct them in any way.";
+%% Test that sending a port or reference to another node and back again
+%% doesn't correct them in any way.
 ref_port_roundtrip(Config) when is_list(Config) ->
     ?line process_flag(trap_exit, true),
     ?line Port = open_port({spawn, efile}, []),
@@ -697,9 +685,8 @@ ref_port_roundtrip(Config) when is_list(Config) ->
 roundtrip(Term) ->
     exit(Term).
 
-nil_roundtrip(doc) ->
-    "Test that the smallest external term [] aka NIL can be sent to "
-	"another node node and back again.";
+%% Test that the smallest external term [] aka NIL can be sent to
+%% another node node and back again.
 nil_roundtrip(Config) when is_list(Config) ->
     ?line process_flag(trap_exit, true),
     ?line {ok, Node} = start_node(nil_roundtrip),
@@ -724,8 +711,7 @@ bounce(Dest) ->
 show_term(Term) ->
     binary_to_list(term_to_binary(Term)).
 
-stop_dist(doc) ->
-    ["Tests behaviour after net_kernel:stop (OTP-2586)."];
+%% Tests behaviour after net_kernel:stop (OTP-2586).
 stop_dist(Config) when is_list(Config) ->
     ?line Str = os:cmd(atom_to_list(lib:progname())
 		       ++ " -noshell -pa "
@@ -741,20 +727,14 @@ stop_dist(Config) when is_list(Config) ->
     ok.
 
 
-trap_bif_1(doc) ->
-    [""];
 trap_bif_1(Config) when is_list(Config) ->
     ?line {true} = tr1(),
     ok.
 
-trap_bif_2(doc) ->
-    [""];
 trap_bif_2(Config) when is_list(Config) ->
     ?line {true} = tr2(),
     ok.
 
-trap_bif_3(doc) ->
-    [""];
 trap_bif_3(Config) when is_list(Config) ->
     ?line {hoo} = tr3(),
     ok.
@@ -792,7 +772,8 @@ tr3() ->
 % * n2 gets pang when pinging n1
 % * n2 forces connection by using net_kernel:connect_node (ovverrides)
 % * n2 gets pong when pinging n1.
-dist_auto_connect_once(doc) -> "Test the dist_auto_connect once kernel parameter";
+
+%% Test the dist_auto_connect once kernel parameter
 dist_auto_connect_once(Config) when is_list(Config) ->
     ?line Sock = start_relay_node(dist_auto_connect_relay_node,[]),
     ?line NN = inet_rpc_nodename(Sock),
@@ -964,10 +945,6 @@ dist_auto_connect_relay(Parent) ->
     dist_auto_connect_relay(Parent).
 
 
-dist_parallel_send(doc) ->
-    [];
-dist_parallel_send(suite) ->
-    [];
 dist_parallel_send(Config) when is_list(Config) ->
     ?line {ok, RNode} = start_node(dist_parallel_receiver),
     ?line {ok, SNode} = start_node(dist_parallel_sender),
@@ -1383,11 +1360,7 @@ start_link(Offender,P) ->
     io:format("Ref is ~p~n",[Ref]),
     ok.
 
-bad_dist_structure(suite) ->
-    [];
-bad_dist_structure(doc) ->
-    ["Test dist messages with valid structure (binary to term ok) but malformed"
-     "control content"];
+%% Test dist messages with valid structure (binary to term ok) but malformed control content
 bad_dist_structure(Config) when is_list(Config) ->
     ct:timetrap({seconds, 15}),
 
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index f519634281..82dd2b87a6 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -179,7 +179,7 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-outputv_errors(doc) -> "Test sending bad types to port with an outputv-capable driver.";
+%% Test sending bad types to port with an outputv-capable driver.
 outputv_errors(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line erl_ddll:start(),
@@ -262,7 +262,7 @@ build_iolist(N0, Base) ->
 	    [47,L,L|Seq]
     end.
 
-outputv_echo(doc) -> ["Test echoing data with a driver that supports outputv."];
+%% Test echoing data with a driver that supports outputv.
 outputv_echo(Config) when is_list(Config) ->
     ct:timetrap({minutes, 10}),
     Name = 'outputv_drv',
@@ -375,7 +375,7 @@ compare(Got, Expected) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-timer_measure(doc) -> ["Check that timers time out in good time."];
+%% Check that timers time out in good time.
 timer_measure(Config) when is_list(Config) ->
     Name = 'timer_drv',
     ?line Port = start_driver(Config, Name, false),
@@ -405,7 +405,7 @@ try_timeouts(Port, Timeout) ->
 	    ?line ct:fail("driver failed to timeout")
     end.
 
-timer_cancel(doc) -> ["Try cancelling timers set in a driver."];
+%% Try cancelling timers set in a driver.
 timer_cancel(Config) when is_list(Config) ->
     Name = 'timer_drv',
     ?line Port = start_driver(Config, Name, false),
@@ -514,9 +514,8 @@ try_change_timer(Port, Timeout) ->
 %% 		Queue test suites
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-queue_echo(doc) ->
-    ["1) Queue up data in a driver that uses the full driver_queue API to do this."
-     "2) Get the data back, a random amount at a time."];
+%% 1) Queue up data in a driver that uses the full driver_queue API to do this.
+%% 2) Get the data back, a random amount at a time.
 queue_echo(Config) when is_list(Config) ->
     case test_server:is_native(?MODULE) of
 	true -> exit(crashes_native_code);
@@ -708,10 +707,6 @@ read_head(Port, Size) ->
     erlang:port_control(Port, ?READ_HEAD, <<Size:32>>).
 
 
-driver_unloaded(doc) ->
-    [];
-driver_unloaded(suite) ->
-    [];
 driver_unloaded(Config) when is_list(Config) ->
     ?line process_flag(trap_exit, true),
     ?line Drv = timer_drv,
@@ -736,8 +731,6 @@ driver_unloaded(Config) when is_list(Config) ->
 	  end.
 					 
 
-io_ready_exit(doc) -> [];
-io_ready_exit(suite) -> [];
 io_ready_exit(Config) when is_list(Config) ->
     ?line OTE = process_flag(trap_exit, true),
     ?line Test = self(),
@@ -796,8 +789,6 @@ io_ready_exit(Config) when is_list(Config) ->
 -define(CHKIO_SMP_SELECT, 7).
 -define(CHKIO_DRV_USE, 8).
 
-use_fallback_pollset(doc) -> [];
-use_fallback_pollset(suite) -> [];
 use_fallback_pollset(Config) when is_list(Config) ->
     FlbkFun = fun () ->
 		      ChkIoDuring = erlang:system_info(check_io),
@@ -837,29 +828,21 @@ use_fallback_pollset(Config) when is_list(Config) ->
 	      _ -> ?line OkRes
 	  end.
 
-bad_fd_in_pollset(doc) -> [];
-bad_fd_in_pollset(suite) -> [];
 bad_fd_in_pollset(Config) when is_list(Config) ->
     ?line chkio_test_fini(chkio_test(chkio_test_init(Config),
 				     ?CHKIO_BAD_FD_IN_POLLSET,
 				     fun () -> ?line sleep(1000) end)).
 
-driver_event(doc) -> [];
-driver_event(suite) -> [];
 driver_event(Config) when is_list(Config) ->
     ?line chkio_test_fini(chkio_test(chkio_test_init(Config),
 				     ?CHKIO_DRIVER_EVENT,
 				     fun () -> ?line sleep(1000) end)).
 
-fd_change(doc) -> [];
-fd_change(suite) -> [];
 fd_change(Config) when is_list(Config) ->
     ?line chkio_test_fini(chkio_test(chkio_test_init(Config),
 				     ?CHKIO_FD_CHANGE,
 				     fun () -> ?line sleep(1000) end)).
 
-steal_control(doc) -> [];
-steal_control(suite) -> [];
 steal_control(Config) when is_list(Config) ->
     ?line chkio_test_fini(case chkio_test_init(Config) of
 			      {erts_poll_info, _} = Hndl ->
@@ -1038,11 +1021,9 @@ get_stable_check_io_info() ->
 	    get_stable_check_io_info()
     end.
 
-otp_6602(doc) -> ["Missed port lock when stealing control of fd from a "
-		  "driver that didn't use the same lock. The lock checker "
-		  "used to trigger on this and dump core."];
-otp_6602(suite) ->
-    [];
+%% Missed port lock when stealing control of fd from a
+%% driver that didn't use the same lock. The lock checker
+%% used to trigger on this and dump core.
 otp_6602(Config) when is_list(Config) ->
     ?line {ok, Node} = start_node(Config),
     ?line Done = make_ref(),
@@ -1084,24 +1065,12 @@ otp_6602(Config) when is_list(Config) ->
 
 -define(EXPECTED_SYSTEM_INFO_NAMES, ?EXPECTED_SYSTEM_INFO_NAMES4).
 
-'driver_system_info_base_ver'(doc) ->
-    [];
-'driver_system_info_base_ver'(suite) ->
-    [];
 'driver_system_info_base_ver'(Config) when is_list(Config) ->
     ?line driver_system_info_test(Config, sys_info_base_drv).
 
-'driver_system_info_prev_ver'(doc) ->
-    [];
-'driver_system_info_prev_ver'(suite) ->
-    [];
 'driver_system_info_prev_ver'(Config) when is_list(Config) ->
     ?line driver_system_info_test(Config, sys_info_prev_drv).
 
-driver_system_info_current_ver(doc) ->    
-    [];
-driver_system_info_current_ver(suite) ->
-    [];
 driver_system_info_current_ver(Config) when is_list(Config) ->
     ?line driver_system_info_test(Config, sys_info_curr_drv).
 
@@ -1205,10 +1174,7 @@ check_si_res(Unexpected) ->
 -define(MON_OP_MONITOR_ME_LATER,4).
 -define(MON_OP_DO_DELAYED_MONITOR,5).
 
-driver_monitor(suite) ->
-    [];
-driver_monitor(doc) ->    
-    ["Test monitoring of processes from drivers"];
+%% Test monitoring of processes from drivers
 driver_monitor(Config) when is_list(Config) ->
     ?line Name = monitor_drv,
     ?line Port = start_driver(Config, Name, false),
@@ -1421,48 +1387,30 @@ ioq_exit_test(Config, TestNo) ->
 	      erl_ddll:unload_driver(Drv)
 	  end.
 
-ioq_exit_ready_input(doc) -> [];
-ioq_exit_ready_input(suite) -> [];
 ioq_exit_ready_input(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_READY_INPUT).
 
-ioq_exit_ready_output(doc) -> [];
-ioq_exit_ready_output(suite) -> [];
 ioq_exit_ready_output(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_READY_OUTPUT).
 
-ioq_exit_timeout(doc) -> [];
-ioq_exit_timeout(suite) -> [];
 ioq_exit_timeout(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_TIMEOUT).
 
-ioq_exit_ready_async(doc) -> [];
-ioq_exit_ready_async(suite) -> [];
 ioq_exit_ready_async(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_READY_ASYNC).
 
-ioq_exit_event(doc) -> [];
-ioq_exit_event(suite) -> [];
 ioq_exit_event(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_EVENT).
 
-ioq_exit_ready_input_async(doc) -> [];
-ioq_exit_ready_input_async(suite) -> [];
 ioq_exit_ready_input_async(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_READY_INPUT_ASYNC).
 
-ioq_exit_ready_output_async(doc) -> [];
-ioq_exit_ready_output_async(suite) -> [];
 ioq_exit_ready_output_async(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_READY_OUTPUT_ASYNC).
 
-ioq_exit_timeout_async(doc) -> [];
-ioq_exit_timeout_async(suite) -> [];
 ioq_exit_timeout_async(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_TIMEOUT_ASYNC).
 
-ioq_exit_event_async(doc) -> [];
-ioq_exit_event_async(suite) -> [];
 ioq_exit_event_async(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_EVENT_ASYNC).
 
@@ -1481,33 +1429,21 @@ vsn_mismatch_test(Config, LoadResult) ->
 		  ?line ok
 	  end.
 
-zero_extended_marker_garb_drv(doc) -> [];
-zero_extended_marker_garb_drv(suite) -> [];
 zero_extended_marker_garb_drv(Config) when is_list(Config) ->
     vsn_mismatch_test(Config, {error, driver_incorrect_version}).
 
-invalid_extended_marker_drv(doc) -> [];
-invalid_extended_marker_drv(suite) -> [];
 invalid_extended_marker_drv(Config) when is_list(Config) ->
     vsn_mismatch_test(Config, {error, driver_incorrect_version}).
 
-larger_major_vsn_drv(doc) -> [];
-larger_major_vsn_drv(suite) -> [];
 larger_major_vsn_drv(Config) when is_list(Config) ->
     vsn_mismatch_test(Config, {error, driver_incorrect_version}).
 
-larger_minor_vsn_drv(doc) -> [];
-larger_minor_vsn_drv(suite) -> [];
 larger_minor_vsn_drv(Config) when is_list(Config) ->
     vsn_mismatch_test(Config, {error, driver_incorrect_version}).
 
-smaller_major_vsn_drv(doc) -> [];
-smaller_major_vsn_drv(suite) -> [];
 smaller_major_vsn_drv(Config) when is_list(Config) ->
     vsn_mismatch_test(Config, {error, driver_incorrect_version}).
 
-smaller_minor_vsn_drv(doc) -> [];
-smaller_minor_vsn_drv(suite) -> [];
 smaller_minor_vsn_drv(Config) when is_list(Config) ->
     DrvVsnStr = erlang:system_info(driver_version),
     case drv_vsn_str2tup(DrvVsnStr) of
@@ -1522,8 +1458,6 @@ smaller_minor_vsn_drv(Config) when is_list(Config) ->
 -define(PEEK_NONXQ_TEST, 0).
 -define(PEEK_NONXQ_WAIT, 1).
 
-peek_non_existing_queue(doc) -> [];
-peek_non_existing_queue(suite) -> [];
 peek_non_existing_queue(Config) when is_list(Config) ->
     ?line OTE = process_flag(trap_exit, true),
     ?line Drv = peek_non_existing_queue_drv,
@@ -1574,10 +1508,6 @@ peek_non_existing_queue(Config) when is_list(Config) ->
 	      erl_ddll:unload_driver(Drv)
 	  end.    
 
-otp_6879(doc) ->
-    [];
-otp_6879(suite) ->
-    [];
 otp_6879(Config) when is_list(Config) ->
     ?line Drv = 'otp_6879_drv',
     ?line Parent = self(),
@@ -1627,10 +1557,6 @@ otp_6879_call(Port, Data, N) ->
 	BadData -> {mismatch, Data, BadData}
     end.
 
-caller(doc) ->
-    [];
-caller(suite) ->
-    [];
 caller(Config) when is_list(Config) ->
     ?line run_caller_test(Config, false),
     ?line run_caller_test(Config, true).
@@ -1681,10 +1607,7 @@ chk_caller(Port, Callback, ExpectedCaller) ->
 	    ExpectedCaller = Caller
     end.
 
-many_events(suite) ->
-    [];
-many_events(doc) ->
-    ["Check that many simultaneously signalled events work (win32)"];
+%% Check that many simultaneously signalled events work (win32)
 many_events(Config) when is_list(Config) ->
     ?line Name = 'many_events_drv',
     ?line Port = start_driver(Config, Name, false),
@@ -1704,10 +1627,6 @@ many_events(Config) when is_list(Config) ->
     ?line ok.
 	     
 
-missing_callbacks(doc) ->
-    [];
-missing_callbacks(suite) ->
-    [];
 missing_callbacks(Config) when is_list(Config) ->
     ?line Name = 'missing_callback_drv',
     ?line Port = start_driver(Config, Name, false),
@@ -1724,10 +1643,7 @@ missing_callbacks(Config) when is_list(Config) ->
     ?line stop_driver(Port, Name),
     ?line ok.
 
-smp_select(doc) ->
-    ["Test concurrent calls to driver_select."];
-smp_select(suite) ->
-    [];
+%% Test concurrent calls to driver_select.
 smp_select(Config) when is_list(Config) -> 
     case os:type() of
 	{win32,_} -> {skipped, "Test not implemented for this OS"};
@@ -1783,10 +1699,7 @@ smp_select_wait(Pids, TimeoutMsg) ->
     end.
 
 
-driver_select_use(doc) ->
-    ["Test driver_select() with new ERL_DRV_USE flag."];
-driver_select_use(suite) ->
-    [];
+%% Test driver_select() with new ERL_DRV_USE flag.
 driver_select_use(Config) when is_list(Config) -> 
     case os:type() of
 	{win32,_} -> {skipped, "Test not implemented for this OS"};
diff --git a/erts/emulator/test/efile_SUITE.erl b/erts/emulator/test/efile_SUITE.erl
index cc061c0cfe..667f1ae9b4 100644
--- a/erts/emulator/test/efile_SUITE.erl
+++ b/erts/emulator/test/efile_SUITE.erl
@@ -87,8 +87,7 @@ file_keys(Dir,Num,FdList,FnList) ->
 	    end
     end.
 
-async_dist(doc) ->
-    "Check that the distribution of files over async threads is fair";
+%% Check that the distribution of files over async threads is fair
 async_dist(Config) when is_list(Config) ->
     DataDir = proplists:get_value(data_dir,Config),
     TestFile = filename:join(DataDir, "existing_file"),
@@ -130,7 +129,6 @@ async_dist(Config) when is_list(Config) ->
 %% that we get the same number of files every time.
 %%
 
-iter_max_files(suite) -> [];
 iter_max_files(Config) when is_list(Config) ->
     DataDir = proplists:get_value(data_dir,Config),
     TestFile = filename:join(DataDir, "existing_file"),
diff --git a/erts/emulator/test/erl_drv_thread_SUITE.erl b/erts/emulator/test/erl_drv_thread_SUITE.erl
index 5c861ae9f0..316dc4b5c5 100644
--- a/erts/emulator/test/erl_drv_thread_SUITE.erl
+++ b/erts/emulator/test/erl_drv_thread_SUITE.erl
@@ -39,16 +39,10 @@ all() ->
 %% Testcases                                                              %%
 %%                                                                        %%
 
-basic(suite) -> [];
-basic(doc) ->   [];
 basic(Cfg) -> ?line drv_case(Cfg, basic).
 
-rwlock(suite) -> [];
-rwlock(doc) ->   [];
 rwlock(Cfg) -> ?line drv_case(Cfg, rwlock).
 
-tsd(suite) -> [];
-tsd(doc) ->   [];
 tsd(Cfg) -> ?line drv_case(Cfg, tsd).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/erts/emulator/test/erl_link_SUITE.erl b/erts/emulator/test/erl_link_SUITE.erl
index 472232a27d..d7257ff7aa 100644
--- a/erts/emulator/test/erl_link_SUITE.erl
+++ b/erts/emulator/test/erl_link_SUITE.erl
@@ -104,8 +104,7 @@ end_per_suite(_Config) ->
     catch erts_debug:set_internal_state(available_internal_state, false).
 
 
-links(doc) -> ["Tests node local links"];
-links(suite) -> [];
+%% Tests node local links
 links(Config) when is_list(Config) ->
     ?line common_link_test(node(), node()),
     ?line true = link(self()),
@@ -113,8 +112,7 @@ links(Config) when is_list(Config) ->
     ?line true = unlink(self()),
     ?line ok.
 
-dist_links(doc) -> ["Tests distributed links"];
-dist_links(suite) -> [];
+%% Tests distributed links
 dist_links(Config) when is_list(Config) ->
     ?line [NodeName] = get_names(1, dist_link),
     ?line {ok, Node} = start_node(NodeName),
@@ -175,8 +173,7 @@ common_link_test(NodeA, NodeB) ->
     ?line check_unlink(TP3, TP2),
     ?line ok.
 
-monitor_nodes(doc) -> ["Tests monitor of nodes"];
-monitor_nodes(suite) -> [];
+%% Tests monitor of nodes
 monitor_nodes(Config) when is_list(Config) ->
     ?line [An, Bn, Cn, Dn] = get_names(4, dist_link),
     ?line {ok, A} = start_node(An),
@@ -230,8 +227,7 @@ monitor_nodes(Config) when is_list(Config) ->
     ?line ok.
     
 
-process_monitors(doc) -> ["Tests node local process monitors"];
-process_monitors(suite) -> [];
+%% Tests node local process monitors
 process_monitors(Config) when is_list(Config) ->
     ?line common_process_monitors(node(), node()),
     ?line Mon1 = erlang:monitor(process,self()),
@@ -251,8 +247,7 @@ process_monitors(Config) when is_list(Config) ->
 		  ?line ok
 	  end.
 
-dist_process_monitors(doc) -> ["Tests distributed process monitors"];
-dist_process_monitors(suite) -> [];
+%% Tests distributed process monitors
 dist_process_monitors(Config) when is_list(Config) -> 
     ?line [Name] = get_names(1,dist_process_monitors),
     ?line {ok, Node} = start_node(Name),
@@ -328,10 +323,8 @@ run_common_process_monitors(TP1, TP2) ->
     ?line ok.
     
 
-busy_dist_port_monitor(doc) -> ["Tests distributed monitor/2, demonitor/1, "
-				"and 'DOWN' message over busy distribution "
-				"port"];
-busy_dist_port_monitor(suite) -> [];
+%% Tests distributed monitor/2, demonitor/1, and 'DOWN' message
+%% over busy distribution port
 busy_dist_port_monitor(Config) when is_list(Config) ->
 
     ?line Tracer = case os:getenv("TRACE_BUSY_DIST_PORT") of
@@ -373,9 +366,8 @@ busy_dist_port_monitor(Config) when is_list(Config) ->
     ?line stop_busy_dist_port_tracer(Tracer),
     ?line ok.
 
-busy_dist_port_link(doc) -> ["Tests distributed link/1, unlink/1, and 'EXIT'",
-			     " message over busy distribution port"];
-busy_dist_port_link(suite) -> [];
+%% Tests distributed link/1, unlink/1, and 'EXIT'
+%% message over busy distribution port
 busy_dist_port_link(Config) when is_list(Config) ->
     ?line Tracer = case os:getenv("TRACE_BUSY_DIST_PORT") of
 		       "true" -> start_busy_dist_port_tracer();
@@ -421,13 +413,9 @@ busy_dist_port_link(Config) when is_list(Config) ->
     ?line ok.
 
 
-otp_5772_link(doc) -> [];
-otp_5772_link(suite) -> [];
 otp_5772_link(Config) when is_list(Config) ->
     ?line otp_5772_link_test(node()).
 
-otp_5772_dist_link(doc) -> [];
-otp_5772_dist_link(suite) -> [];
 otp_5772_dist_link(Config) when is_list(Config) ->
     ?line [An] = get_names(1, otp_5772_dist_link),
     ?line {ok, A} = start_node(An),
@@ -457,13 +445,9 @@ otp_5772_link_test(Node) ->
     ?line process_flag(priority, Prio),
     ?line ok.
 
-otp_5772_monitor(doc) -> [];
-otp_5772_monitor(suite) -> [];
 otp_5772_monitor(Config) when is_list(Config) ->
     ?line otp_5772_monitor_test(node()).
 
-otp_5772_dist_monitor(doc) -> [];
-otp_5772_dist_monitor(suite) -> [];
 otp_5772_dist_monitor(Config) when is_list(Config) ->
     ?line [An] = get_names(1, otp_5772_dist_monitor),
     ?line {ok, A} = start_node(An),
diff --git a/erts/emulator/test/estone_SUITE.erl b/erts/emulator/test/estone_SUITE.erl
index 33728c3f5a..56b6248b10 100644
--- a/erts/emulator/test/estone_SUITE.erl
+++ b/erts/emulator/test/estone_SUITE.erl
@@ -73,10 +73,7 @@ groups() ->
     [{estone_bench, [{repeat,50}],[estone_bench]}].
 
 
-estone(suite) ->
-    [];
-estone(doc) ->
-    ["EStone Test"];
+%% EStone Test
 estone(Config) when is_list(Config) ->
     ?line DataDir = proplists:get_value(data_dir,Config),
     ?line Mhz=get_cpu_speed(os:type(),DataDir),
diff --git a/erts/emulator/test/float_SUITE.erl b/erts/emulator/test/float_SUITE.erl
index df44e28e2c..9fd414ff97 100644
--- a/erts/emulator/test/float_SUITE.erl
+++ b/erts/emulator/test/float_SUITE.erl
@@ -48,10 +48,7 @@ groups() ->
 %% OTP-7178, list_to_float on very small numbers should give 0.0
 %% instead of exception, i.e. ignore underflow.
 %%
-otp_7178(suite) ->
-    [];
-otp_7178(doc) ->
-    ["test that list_to_float on very small numbers give 0.0"];
+%% test that list_to_float on very small numbers give 0.0
 otp_7178(Config) when is_list(Config) ->
     ?line X = list_to_float("1.0e-325"),
     ?line true = (X < 0.00000001) and (X > -0.00000001),
diff --git a/erts/emulator/test/fun_SUITE.erl b/erts/emulator/test/fun_SUITE.erl
index f89cc623c4..db14ffc005 100644
--- a/erts/emulator/test/fun_SUITE.erl
+++ b/erts/emulator/test/fun_SUITE.erl
@@ -45,9 +45,7 @@ all() ->
      const_propagation, t_arity, t_is_function2, t_fun_info,
      t_fun_info_mfa].
 
-bad_apply(doc) ->
-    "Test that the correct EXIT code is returned for all types of bad funs.";
-bad_apply(suite) -> [];
+%% Test that the correct EXIT code is returned for all types of bad funs.
 bad_apply(Config) when is_list(Config) ->
     ?line bad_apply_fc(42, [0]),
     ?line bad_apply_fc(xx, [1]),
@@ -85,9 +83,7 @@ bad_apply_badarg(Fun, Args) ->
 	    ct:fail({bad_result, Other})
     end.
 
-bad_fun_call(doc) ->
-    "Try directly calling bad funs.";
-bad_fun_call(suite) -> [];
+%% Try directly calling bad funs.
 bad_fun_call(Config) when is_list(Config) ->
     ?line bad_call_fc(42),
     ?line bad_call_fc(xx),
@@ -259,7 +255,7 @@ copy_term(Term) ->
 make_fun(X) ->
     fun() -> X end.
 	    
-ordering(doc) -> "Tests ordering of funs.";
+%% Tests ordering of funs.
 ordering(Config) when is_list(Config) ->
     F1 = make_fun(1, 2),
     F1_copy = copy_term(F1),
@@ -386,8 +382,7 @@ ordering(Config) when is_list(Config) ->
 make_fun(X, Y) ->
     fun(A) -> A*X+Y end.
 
-fun_to_port(doc) -> "Try sending funs to ports (should fail).";
-fun_to_port(suite) -> [];
+%% Try sending funs to ports (should fail).
 fun_to_port(Config) when is_list(Config) ->
     ?line fun_to_port(Config, xxx),
     ?line fun_to_port(Config, fun() -> 42 end),
@@ -417,8 +412,7 @@ build_io_list(N) ->
 	1 -> [7,L|L]
     end.
 
-t_hash(doc) -> "Test the hash/2 BIF on funs.";
-t_hash(suite) -> [];
+%% Test the hash/2 BIF on funs.
 t_hash(Config) when is_list(Config) ->
     F1 = fun(_X) -> 1 end,
     F2 = fun(_X) -> 2 end,
@@ -445,8 +439,7 @@ t_hash(Config) when is_list(Config) ->
 hash(Term) ->
     erlang:hash(Term, 16#7ffffff).
 
-t_phash(doc) -> "Test the phash/2 BIF on funs.";
-t_phash(suite) -> [];
+%% Test the phash/2 BIF on funs.
 t_phash(Config) when is_list(Config) ->
     F1 = fun(_X) -> 1 end,
     F2 = fun(_X) -> 2 end,
@@ -474,8 +467,7 @@ t_phash(Config) when is_list(Config) ->
 phash(Term) ->
     erlang:phash(Term, 16#7ffffff).
 
-t_phash2(doc) -> "Test the phash2/2 BIF on funs.";
-t_phash2(suite) -> [];
+%% Test the phash2/2 BIF on funs.
 t_phash2(Config) when is_list(Config) ->
     F1 = fun(_X) -> 1 end,
     F2 = fun(_X) -> 2 end,
@@ -506,8 +498,7 @@ phash2(Term) ->
 make_fun(X, Y, Z) ->
     fun() -> {X,Y,Z} end.
 
-md5(doc) -> "Test that MD5 bifs reject funs properly.";
-md5(suite) -> [];
+%% Test that MD5 bifs reject funs properly.
 md5(Config) when is_list(Config) ->
     _ = size(erlang:md5_init()),
 
diff --git a/erts/emulator/test/gc_SUITE.erl b/erts/emulator/test/gc_SUITE.erl
index cccd726b1c..8e5f0b05a1 100644
--- a/erts/emulator/test/gc_SUITE.erl
+++ b/erts/emulator/test/gc_SUITE.erl
@@ -34,9 +34,9 @@ all() ->
     [grow_heap, grow_stack, grow_stack_heap].
 
 
-grow_heap(doc) -> ["Produce a growing list of elements, ",
-		   "for X calls, then drop one item per call",
-		   "until the list is empty."];
+%% Produce a growing list of elements,
+%% for X calls, then drop one item per call
+%% until the list is empty.
 grow_heap(Config) when is_list(Config) ->
     ct:timetrap({minutes, 40}),
     ok  = grow_heap1(256),
@@ -68,8 +68,8 @@ grow_heap1([_|List], MaxLen, CurLen, down) ->
 
 
 
-grow_stack(doc) -> ["Increase and decrease stack size, and ",
-		    "drop off some garbage from time to time."];
+%% Increase and decrease stack size, and
+%% drop off some garbage from time to time.
 grow_stack(Config) when is_list(Config) ->
     ct:timetrap({minutes, 80}),
     show_heap("before:"),
@@ -91,9 +91,8 @@ grow_stack1(Recs, CurRecs) ->
 
 
 %% Let's see how BEAM handles this one...
-grow_stack_heap(doc) -> ["While growing the heap, bounces the size ",
-			 "of the stack, and while reducing the heap",
-			 "bounces the stack usage."];
+%% While growing the heap, bounces the size of the
+%% stack, and while reducing the heap, bounces the stack usage.
 grow_stack_heap(Config) when is_list(Config) ->
     ct:timetrap({minutes, 40}),
     grow_stack_heap1(16),
diff --git a/erts/emulator/test/guard_SUITE.erl b/erts/emulator/test/guard_SUITE.erl
index f43c30e421..77dcc0f607 100644
--- a/erts/emulator/test/guard_SUITE.erl
+++ b/erts/emulator/test/guard_SUITE.erl
@@ -37,7 +37,7 @@ all() ->
      type_tests, guard_bif_binary_part].
 
 
-bad_arith(doc) -> "Test that a bad arithmetic operation in a guard works correctly.";
+%% Test that a bad arithmetic operation in a guard works correctly.
 bad_arith(Config) when is_list(Config) ->
     ?line 5 = bad_arith1(2, 3),
     ?line 10 = bad_arith1(1, infinity),
@@ -49,7 +49,7 @@ bad_arith1(T1, T2) when T1+T2 < 10 ->
 bad_arith1(_, _) ->
     10.
 
-bad_tuple(doc) -> "Test that bad arguments to element/2 are handled correctly.";
+%% Test that bad arguments to element/2 are handled correctly.
 bad_tuple(Config) when is_list(Config) ->
     ?line error = bad_tuple1(a),
     ?line error = bad_tuple1({a, b}),
@@ -64,7 +64,6 @@ bad_tuple1(T) when element(3, T) == y ->
 bad_tuple1(_) ->
     error.
 
-test_heap_guards(doc) -> "";
 test_heap_guards(Config) when is_list(Config) ->
     ct:timetrap({minutes, 2}),
     
@@ -149,8 +148,7 @@ mask_error({'EXIT',{Err,_}}) ->
 mask_error(Else) ->
     Else.
 
-guard_bif_binary_part(doc) ->
-    ["Test the binary_part/2,3 guard BIF's extensively"];
+%% Test the binary_part/2,3 guard BIF's extensively
 guard_bif_binary_part(Config) when is_list(Config) ->
     %% Overflow tests that need to be unoptimized
     ?line badarg =
@@ -307,7 +305,7 @@ bptest(_,_,_) ->
     error.
 
 
-guard_bifs(doc) -> "Test all guard bifs with nasty (but legal arguments).";
+%% Test all guard bifs with nasty (but legal arguments).
 guard_bifs(Config) when is_list(Config) ->
     ?line Big = -237849247829874297658726487367328971246284736473821617265433,
     ?line Float = 387924.874,
@@ -437,7 +435,7 @@ guard_bif('node/0', X, Y) when node() == Y ->
 guard_bif('node/1', X, Y) when node(X) == Y ->
     {'node/1', X, Y}.
 
-type_tests(doc) -> "Test the type tests.";
+%% Test the type tests.
 type_tests(Config) when is_list(Config) ->
     ?line Types = all_types(),
     ?line Tests = type_test_desc(),
diff --git a/erts/emulator/test/hash_SUITE.erl b/erts/emulator/test/hash_SUITE.erl
index 4c50131108..be254f5543 100644
--- a/erts/emulator/test/hash_SUITE.erl
+++ b/erts/emulator/test/hash_SUITE.erl
@@ -84,48 +84,29 @@ all() ->
      test_phash2, otp_5292, bit_level_binaries, otp_7127,
      test_hash_zero].
 
-test_basic(suite) ->
-    [];
-test_basic(doc) ->
-    ["Tests basic functionality of erlang:phash and that the "
-     "hashes has not changed (neither hash nor phash)"];
+%% Tests basic functionality of erlang:phash and that the
+%% hashes has not changed (neither hash nor phash)
 test_basic(Config) when is_list(Config) ->
     basic_test().
 
 
-test_cmp(suite) ->
-    [];
-test_cmp(doc) ->
-    ["Compares integer hashes made by erlang:phash with those of a reference "
-     "implementation"];
+%% Compares integer hashes made by erlang:phash with those of a reference implementation
 test_cmp(Config) when is_list(Config) ->
     cmp_test(10000).
 
-test_range(suite) ->
-    [];
-test_range(doc) ->
-    ["Tests ranges on erlang:phash from 1 to 2^32"];
+%% Tests ranges on erlang:phash from 1 to 2^32
 test_range(Config) when is_list(Config) ->
     range_test().
 
-test_spread(suite) ->
-    [];
-test_spread(doc) ->
-    ["Tests that the hashes are spread ok"];
+%% Tests that the hashes are spread ok
 test_spread(Config) when is_list(Config) ->
     spread_test(10).
 
-test_phash2(suite) ->
-    [];
-test_phash2(doc) ->
-    ["Tests phash2"];
+%% Tests phash2
 test_phash2(Config) when is_list(Config) ->
     phash2_test().
 
-otp_5292(suite) ->
-    [];
-otp_5292(doc) ->
-    ["Tests hash, phash and phash2 regarding integers."];
+%% Tests hash, phash and phash2 regarding integers.
 otp_5292(Config) when is_list(Config) ->
     otp_5292_test().
 
@@ -133,10 +114,7 @@ otp_5292(Config) when is_list(Config) ->
 bit_level_binaries(Config) when is_list(Config) ->
     bit_level_binaries_do().
 
-otp_7127(suite) ->
-    [];
-otp_7127(doc) ->
-    ["Tests phash2/1."];
+%% Tests phash2/1.
 otp_7127(Config) when is_list(Config) ->
     otp_7127_test().
 
diff --git a/erts/emulator/test/hibernate_SUITE.erl b/erts/emulator/test/hibernate_SUITE.erl
index 177468fdfd..1d3d8a69de 100644
--- a/erts/emulator/test/hibernate_SUITE.erl
+++ b/erts/emulator/test/hibernate_SUITE.erl
@@ -329,8 +329,6 @@ bar() ->
 %% No heap
 %%
 
-no_heap(doc) -> [];
-no_heap(suite) -> [];
 no_heap(Config) when is_list(Config) ->
     ?line H = spawn_link(fun () -> clean_dict(), no_heap_loop() end),
     ?line lists:foreach(fun (_) ->
@@ -359,8 +357,6 @@ clean_dict() ->
 %% Wake up and then immediatly bif trap with a lengthy computation.
 %%
 
-wake_up_and_bif_trap(doc) -> [];
-wake_up_and_bif_trap(suite) -> [];
 wake_up_and_bif_trap(Config) when is_list(Config) ->
     ?line Self = self(),
     ?line Pid = spawn_link(fun() -> erlang:hibernate(?MODULE, characters_to_list_trap, [Self]) end),
diff --git a/erts/emulator/test/list_bif_SUITE.erl b/erts/emulator/test/list_bif_SUITE.erl
index 7410cde99b..40224723d8 100644
--- a/erts/emulator/test/list_bif_SUITE.erl
+++ b/erts/emulator/test/list_bif_SUITE.erl
@@ -35,10 +35,7 @@ all() ->
     [hd_test, tl_test, t_length, t_list_to_pid,
      t_list_to_float, t_list_to_integer].
 
-t_list_to_integer(suite) ->
-    [];
-t_list_to_integer(doc) ->
-    ["tests list_to_integer and string:to_integer"];
+%% Tests list_to_integer and string:to_integer
 t_list_to_integer(Config) when is_list(Config) ->
     ?line {'EXIT',{badarg,_}} = (catch list_to_integer("12373281903728109372810937209817320981321ABC")),
     ?line 12373281903728109372810937209817320981321 = (catch list_to_integer("12373281903728109372810937209817320981321")),
diff --git a/erts/emulator/test/match_spec_SUITE.erl b/erts/emulator/test/match_spec_SUITE.erl
index 0e45ebf953..6e1ca726a6 100644
--- a/erts/emulator/test/match_spec_SUITE.erl
+++ b/erts/emulator/test/match_spec_SUITE.erl
@@ -62,9 +62,6 @@ all() ->
 not_run(Config) when is_list(Config) ->
     {skipped, "Native Code"}.
 
-test_1(doc) ->
-    [""];
-test_1(suite) -> [];
 test_1(Config) when is_list(Config) ->
     ?line tr(fun() -> ?MODULE:f1(a) end,
 	     {?MODULE, f1, 1},
@@ -155,9 +152,6 @@ test_1(Config) when is_list(Config) ->
 
     ok.
 
-test_2(doc) ->
-    [""];
-test_2(suite) -> [];
 test_2(Config) when is_list(Config) ->
     ?line tr(fun() -> ?MODULE:f2(a, a) end,
 	     {?MODULE, f2, 2},
@@ -166,9 +160,7 @@ test_2(Config) when is_list(Config) ->
 	      {return_from, {?MODULE, f2, 2}, {a, a}}]),
     ok.
 
-test_3(doc) ->
-    ["Test the enable_trace/2 and caller/0 PAM instructions"];
-test_3(suite) -> [];
+%% Test the enable_trace/2 and caller/0 PAM instructions
 test_3(Config) when is_list(Config) ->
     ?line Fun1 = fun() -> 
 		   register(fnoppelklopfer,self()),
@@ -189,7 +181,6 @@ test_3(Config) when is_list(Config) ->
     ?line collect(P1, [{trace, P1, call, {?MODULE, f2, [a, b]}, [true]}]),
     ?line ok.
 
-otp_9422(doc) -> [];
 otp_9422(Config) when is_list(Config) ->
     Laps = 10000,
     ?line Fun1 = fun() -> otp_9422_tracee() end,
@@ -235,11 +226,9 @@ bad_match_spec_bin(Config) when is_list(Config) ->
 
 
 
-trace_control_word(doc) ->
-    ["Test the erlang:system_info(trace_control_word) and ",
-     "erlang:system_flag(trace_control_word, Value) BIFs, ", 
-     "as well as the get_tcw/0 and set_tcw/1 PAM instructions"];
-trace_control_word(suite) -> [];
+%% Test the erlang:system_info(trace_control_word) and
+%% erlang:system_flag(trace_control_word, Value) BIFs,
+%% as well as the get_tcw/0 and set_tcw/1 PAM instructions
 trace_control_word(Config) when is_list(Config) ->
     ?line 32 = Bits = tcw_bits(),
     ?line High = 1 bsl (Bits - 1),
@@ -305,11 +294,8 @@ tcw_bits(Save, Prev, Bits) ->
 	  end.
 
 
-
-silent(doc) ->
-    ["Test the erlang:trace(_, _, [silent]) flag ",
-     "as well as the silent/0 PAM instruction"];
-silent(suite) -> [];
+%% Test the erlang:trace(_, _, [silent]) flag
+%% as well as the silent/0 PAM instruction
 silent(Config) when is_list(Config) ->
     %% Global call trace
     ?line tr(fun() -> 
@@ -371,9 +357,7 @@ silent(Config) when is_list(Config) ->
 	      {call, {?MODULE, f1, [d]}, d} ]),
     ok.
 
-silent_no_ms(doc) ->
-    ["Test the erlang:trace(_, _, [silent]) flag without match specs"];
-silent_no_ms(suite) -> [];
+%% Test the erlang:trace(_, _, [silent]) flag without match specs
 silent_no_ms(Config) when is_list(Config) ->
     %% Global call trace
     %%
@@ -479,17 +463,14 @@ silent_no_ms(Config) when is_list(Config) ->
 			 {trace,Tracee,return_to,{?MODULE,f3,2}}]
 	    end).
 
-silent_test(doc) ->
-    ["Test that match_spec_test does not activate silent"];
+%% Test that match_spec_test does not activate silent
 silent_test(_Config) ->
     {flags,[]} = erlang:trace_info(self(),flags),
     erlang:match_spec_test([],[{'_',[],[{silent,true}]}],trace),
     {flags,[]} = erlang:trace_info(self(),flags).
 
 
-ms_trace2(doc) ->
-    ["Test the match spec functions {trace/2}"];
-ms_trace2(suite) -> [];
+%% Test the match spec functions {trace/2}
 ms_trace2(Config) when is_list(Config) ->
     Tracer = self(),
     %% Meta trace init
@@ -563,9 +544,7 @@ ms_trace2(Config) when is_list(Config) ->
 
 
 
-ms_trace3(doc) ->
-    ["Test the match spec functions {trace/3}"];
-ms_trace3(suite) -> [];
+%% Test the match spec functions {trace/3}
 ms_trace3(Config) when is_list(Config) ->
     TraceeName = 'match_spec_SUITE:ms_trace3',
     Tracer = self(),
@@ -673,9 +652,7 @@ ms_trace3(Config) when is_list(Config) ->
 
 
 
-destructive_in_test_bif(doc) ->
-    ["Test that destructive operations in test bif does not really happen"];
-destructive_in_test_bif(suite) -> [];
+%% Test that destructive operations in test bif does not really happen
 destructive_in_test_bif(Config) when is_list(Config) ->
     ?line {ok,OldToken,_,_} = erlang:match_spec_test
 				([],
@@ -697,9 +674,7 @@ destructive_in_test_bif(Config) when is_list(Config) ->
 			       ([],[{'_',[],[{message,{get_tcw}}]}],trace),
     ok.
 
-boxed_and_small(doc) ->
-    ["Test that the comparision between boxed and small does not crash emulator"];
-boxed_and_small(suite) -> [];
+%% Test that the comparision between boxed and small does not crash emulator
 boxed_and_small(Config) when is_list(Config) ->
     ?line {ok, Node} = start_node(match_spec_suite_other),
     ?line ok = rpc:call(Node,?MODULE,do_boxed_and_small,[]),
@@ -713,9 +688,7 @@ do_boxed_and_small() ->
     {ok, false, _, _} = erlang:match_spec_test({0,3},[{{make_ref(),'_'},[],['$_']}],table),
     ok.
 
-faulty_seq_trace(doc) ->
-    ["Test that faulty seq_trace_call does not crash emulator"];
-faulty_seq_trace(suite) -> [];
+%% Test that faulty seq_trace_call does not crash emulator
 faulty_seq_trace(Config) when is_list(Config) ->
     ?line {ok, Node} = start_node(match_spec_suite_other),
     ?line ok = rpc:call(Node,?MODULE,do_faulty_seq_trace,[]),
@@ -734,10 +707,7 @@ errchk(Pat) ->
 	    ct:fail({noerror, Other})
     end.
 
-unary_minus(suite) ->
-    [];
-unary_minus(doc) ->
-    ["Checks that unary minus works"];
+%% Checks that unary minus works
 unary_minus(Config) when is_list(Config) ->
     ?line {ok,true,[],[]} = erlang:match_spec_test
 			      (5,
@@ -764,10 +734,8 @@ unary_minus(Config) when is_list(Config) ->
 				 [true]}],
 			       table),
     ok.
-unary_plus(suite) ->
-    [];
-unary_plus(doc) ->
-    ["Checks that unary plus works"];
+
+%% Checks that unary plus works
 unary_plus(Config) when is_list(Config) ->
     ?line {ok,true,[],[]} = erlang:match_spec_test
 			      (5,
@@ -798,10 +766,7 @@ unary_plus(Config) when is_list(Config) ->
 
     
 
-guard_exceptions(suite) ->
-    [];
-guard_exceptions(doc) ->
-    ["Checks that exceptions in guards are handled correctly"];
+%% Checks that exceptions in guards are handled correctly
 guard_exceptions(Config) when is_list(Config) ->
     ?line {ok,false,[],[]} = erlang:match_spec_test
 			       (5,
@@ -862,10 +827,7 @@ guard_exceptions(Config) when is_list(Config) ->
 
     ok.
 
-fpe(suite) ->
-    [];
-fpe(doc) ->
-    ["Checks floating point exceptions in match-specs"];
+%% Checks floating point exceptions in match-specs
 fpe(Config) when is_list(Config) ->
     MS = [{{'$1'},[],[{'/','$1',0}]}],
     case catch (['EXIT','EXIT'] = 
@@ -874,6 +836,7 @@ fpe(Config) when is_list(Config) ->
 	_ -> ok 
     end.
 
+%% Test maps in match-specs
 maps(Config) when is_list(Config) ->
     {ok,#{},[],[]} = erlang:match_spec_test(#{}, [{'_',[],['$_']}], table),
     {ok,#{},[],[]} = erlang:match_spec_test(#{}, [{#{},[],['$_']}], table),
diff --git a/erts/emulator/test/monitor_SUITE.erl b/erts/emulator/test/monitor_SUITE.erl
index d37b76ec20..5a866e7bfa 100644
--- a/erts/emulator/test/monitor_SUITE.erl
+++ b/erts/emulator/test/monitor_SUITE.erl
@@ -46,17 +46,14 @@ groups() ->
     [{remove_monitor, [],
       [local_remove_monitor, remote_remove_monitor]}].
 
-case_1(doc) ->
-    "A monitors B, B kills A and then exits (yielded core dump)";
-case_1(suite) -> [];
+%% A monitors B, B kills A and then exits (yielded core dump)
 case_1(Config) when is_list(Config) ->
     ?line process_flag(trap_exit, true),
     ?line spawn_link(?MODULE, g0, []),
     ?line receive _ -> ok end,
     ok.
 
-case_1a(doc) ->
-    "A monitors B, B kills A and then exits (yielded core dump)";
+%% A monitors B, B kills A and then exits (yielded core dump)
 case_1a(Config) when is_list(Config) ->
     ?line process_flag(trap_exit, true),
     ?line spawn_link(?MODULE, g1, []),
@@ -82,8 +79,7 @@ g(Parent) ->
     ?line ok.
 
 
-case_2(doc) ->
-    "A monitors B, B demonitors A (yielded core dump)";
+%% A monitors B, B demonitors A (yielded core dump)
 case_2(Config) when is_list(Config) ->
     ?line B = spawn(?MODULE, y2, [self()]),
     ?line R = erlang:monitor(process, B),
@@ -96,8 +92,7 @@ case_2(Config) when is_list(Config) ->
     ?line expect_down(R, B, normal),
     ok.
 
-case_2a(doc) ->
-    "A monitors B, B demonitors A (yielded core dump)";
+%% A monitors B, B demonitors A (yielded core dump)
 case_2a(Config) when is_list(Config) ->
     ?line {B,R} = spawn_monitor(?MODULE, y2, [self()]),
     ?line B ! R,
@@ -140,9 +135,6 @@ expect_no_msg() ->
 
 %%% Error cases for monitor/2
 
-mon_e_1(doc) ->
-    "Error cases for monitor/2";
-mon_e_1(suite) -> [];
 mon_e_1(Config) when is_list(Config) ->
     ?line {ok, N} = test_server:start_node(hej, slave, []),
     ?line mon_error(plutt, self()),
@@ -171,9 +163,6 @@ mon_error(Type, Item) ->
 
 %%% Error cases for demonitor/1
 
-demon_e_1(doc) ->
-    "Error cases for demonitor/1";
-demon_e_1(suite) -> [];
 demon_e_1(Config) when is_list(Config) ->
     ?line {ok, N} = test_server:start_node(hej, slave, []),
     ?line demon_error(plutt, badarg),
@@ -211,9 +200,6 @@ demon_error(Ref, Reason) ->
 
 %%% No-op cases for demonitor/1
 
-demon_1(doc) ->
-    "demonitor/1";
-demon_1(suite) -> [];
 demon_1(Config) when is_list(Config) ->
     ?line true = erlang:demonitor(make_ref()),
     ok.
@@ -221,9 +207,6 @@ demon_1(Config) when is_list(Config) ->
 
 %%% Cases for demonitor/1
 
-demon_2(doc) ->
-    "Cases for demonitor/1";
-demon_2(suite) -> [];
 demon_2(Config) when is_list(Config) ->
     ?line R1 = erlang:monitor(process, self()),
     ?line true = erlang:demonitor(R1),
@@ -257,9 +240,7 @@ demon_2(Config) when is_list(Config) ->
 
     ok.
 
-demon_3(doc) ->
-    "Distributed case for demonitor/1 (OTP-3499)";
-demon_3(suite) -> [];
+%% Distributed case for demonitor/1 (OTP-3499)
 demon_3(Config) when is_list(Config) ->
     ?line {ok, N} = test_server:start_node(hej, slave, []),
 
@@ -281,8 +262,6 @@ demon_3(Config) when is_list(Config) ->
 
     ok.
 
-demonitor_flush(suite) -> [];
-demonitor_flush(doc) -> [];
 demonitor_flush(Config) when is_list(Config) ->
     ?line {'EXIT', {badarg, _}} = (catch erlang:demonitor(make_ref(), flush)),
     ?line {'EXIT', {badarg, _}} = (catch erlang:demonitor(make_ref(), [flus])),
@@ -385,9 +364,6 @@ start_remove_monitor_group(Node) ->
 				      
 %%% Cases for monitor/2
 
-mon_1(doc) ->
-    "Cases for monitor/2";
-mon_1(suite) -> [];
 mon_1(Config) when is_list(Config) ->
     %% Normal case
     ?line P2 = spawn(timer, sleep, [1]),
@@ -431,9 +407,7 @@ mon_1(Config) when is_list(Config) ->
 
     ok.
 
-mon_2(doc) ->
-    "Distributed cases for monitor/2";
-mon_2(suite) -> [];
+%% Distributed cases for monitor/2
 mon_2(Config) when is_list(Config) ->
     ?line {ok, N1} = test_server:start_node(hej1, slave, []),
 
@@ -503,9 +477,6 @@ mon_2(Config) when is_list(Config) ->
 
 %%% Large exit reason. Crashed first attempt to release R5B.
 
-large_exit(doc) ->
-    "Large exit reason";
-large_exit(suite) -> [];
 large_exit(Config) when is_list(Config) ->
     ?line f(100),
     ok.
@@ -544,10 +515,6 @@ large_exit_sub(S) ->
 %%% by using erlang:process_info(self(), monitors)
 %%% and      erlang:process_info(self(), monitored_by)
 
-list_cleanup(doc) ->
-    "Testing of monitor link list cleanup by using " ++
-    "erlang:process_info/2";
-list_cleanup(suite) -> [];
 list_cleanup(Config) when is_list(Config) ->
     ?line P0 = self(),
     ?line M  = node(),
@@ -641,8 +608,6 @@ list_cleanup(Config) when is_list(Config) ->
     
 %%% Mixed internal and external monitors
 
-mixer(doc) ->
-    "Test mixing of internal and external monitors.";
 mixer(Config) when is_list(Config) ->
     PA = filename:dirname(code:which(?MODULE)),
     NN = [j0,j1,j2],
@@ -726,9 +691,8 @@ mixer(Config) when is_list(Config) ->
     [test_server:stop_node(K) || K <- NL0],
     ok.
 
-named_down(doc) -> ["Test that DOWN message for a named monitor isn't"
-		    " delivered until name has been unregistered"];
-named_down(suite) -> [];
+%% Test that DOWN message for a named monitor isn't
+%%  delivered until name has been unregistered
 named_down(Config) when is_list(Config) ->
     ?line Name = list_to_atom(atom_to_list(?MODULE)
 			      ++ "-named_down-"
@@ -772,8 +736,6 @@ named_down(Config) when is_list(Config) ->
     ?line process_flag(priority,Prio),
     ok.
 
-otp_5827(doc) -> [];
-otp_5827(suite) -> [];
 otp_5827(Config) when is_list(Config) ->
     %% Make a pid with the same nodename but with another creation
     ?line [CreEnd | RPTail]
diff --git a/erts/emulator/test/nested_SUITE.erl b/erts/emulator/test/nested_SUITE.erl
index f9a913ecc8..1e7dce4352 100644
--- a/erts/emulator/test/nested_SUITE.erl
+++ b/erts/emulator/test/nested_SUITE.erl
@@ -68,8 +68,7 @@ case_in_after(Config) when is_list(Config) ->
 	end,
     ok.
 
-catch_in_catch(doc) -> "Test a catch within a catch in the same function.";
-catch_in_catch(suite) -> [];
+%% Test a catch within a catch in the same function.
 catch_in_catch(Config) when is_list(Config) ->
     ?line {outer, inner_exit} = catcher(),
     ok.
@@ -88,8 +87,7 @@ catcher() ->
 	    {outer, Res2}
     end.
 
-bif_in_bif(doc) -> "Test a BIF call within a BIF call.";
-bif_in_bif(suite) -> [];
+%% Test a BIF call within a BIF call.
 bif_in_bif(Config) when is_list(Config) ->
     Self = self(),
     put(pid, Self),
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl
index 6a309b8b7f..c5921ca859 100644
--- a/erts/emulator/test/nif_SUITE.erl
+++ b/erts/emulator/test/nif_SUITE.erl
@@ -85,8 +85,7 @@ end_per_testcase(_Func, _Config) ->
     P2 = code:purge(nif_mod),
     io:format("fin purged=~p, deleted=~p and then purged=~p\n",[P1,Del,P2]).
 
-basic(doc) -> ["Basic smoke test of load_nif and a simple NIF call"];
-basic(suite) -> [];
+%% Basic smoke test of load_nif and a simple NIF call
 basic(Config) when is_list(Config) ->
     ensure_lib_loaded(Config),
     ?line true = (lib_version() =/= undefined),
@@ -95,8 +94,7 @@ basic(Config) when is_list(Config) ->
     ?line true = lists:member(?MODULE, erlang:system_info(taints)),
     ok.
 
-reload(doc) -> ["Test reload callback in nif lib"];
-reload(suite) -> [];  
+%% Test reload callback in nif lib
 reload(Config) when is_list(Config) ->    
     TmpMem = tmpmem(),
     ensure_lib_loaded(Config),
@@ -131,8 +129,7 @@ reload(Config) when is_list(Config) ->
     ?line verify_tmpmem(TmpMem),
     ok.
 
-upgrade(doc) -> ["Test upgrade callback in nif lib"];
-upgrade(suite) -> [];  
+%% Test upgrade callback in nif lib
 upgrade(Config) when is_list(Config) ->    
     TmpMem = tmpmem(),
     ensure_lib_loaded(Config),
@@ -222,8 +219,7 @@ upgrade(Config) when is_list(Config) ->
     ?line verify_tmpmem(TmpMem),
     ok.
 
-heap_frag(doc) -> ["Test NIF building heap fragments"];
-heap_frag(suite) -> [];  
+%% Test NIF building heap fragments
 heap_frag(Config) when is_list(Config) ->    
     TmpMem = tmpmem(),
     ensure_lib_loaded(Config),
@@ -240,8 +236,7 @@ heap_frag_do(N, Max) ->
     L = list_seq(N),
     heap_frag_do(((N*5) div 4) + 1, Max).
 
-types(doc) -> ["Type tests"];
-types(suite) -> [];
+%% Type tests
 types(Config) when is_list(Config) ->
     TmpMem = tmpmem(),
     ensure_lib_loaded(Config),
@@ -325,8 +320,7 @@ eq_cmp_do(A,B) ->
     ok. 
 
 
-many_args(doc) -> ["Test NIF with many arguments"];
-many_args(suite) -> [];
+%% Test NIF with many arguments
 many_args(Config) when is_list(Config) ->
     TmpMem = tmpmem(),
     ?line ensure_lib_loaded(Config ,1),
@@ -335,8 +329,7 @@ many_args(Config) when is_list(Config) ->
     ?line verify_tmpmem(TmpMem),
     ok.
 
-binaries(doc) -> ["Test NIF binary handling."];
-binaries(suite) -> [];
+%% Test NIF binary handling.
 binaries(Config) when is_list(Config) ->
     TmpMem = tmpmem(),
     ?line ensure_lib_loaded(Config, 1),
@@ -398,8 +391,7 @@ test_make_sub_bin(Bin) ->
     ?line <<>> = make_sub_bin(Bin, Size, 0),
     ok.
     
-get_string(doc) -> ["Test enif_get_string"];
-get_string(suite) -> [];
+%% Test enif_get_string
 get_string(Config) when is_list(Config) ->
     ?line ensure_lib_loaded(Config, 1),
     ?line {7, <<"hejsan",0,_:3/binary>>} = string_to_bin("hejsan",10),
@@ -413,8 +405,7 @@ get_string(Config) when is_list(Config) ->
     ?line {0, <<>>} = string_to_bin("",0),
     ok.
 
-get_atom(doc) -> ["Test enif_get_atom"];
-get_atom(suite) -> [];
+%% Test enif_get_atom
 get_atom(Config) when is_list(Config) ->
     ?line ensure_lib_loaded(Config, 1),
     ?line {7, <<"hejsan",0,_:3/binary>>} = atom_to_bin(hejsan,10),
@@ -426,8 +417,7 @@ get_atom(Config) when is_list(Config) ->
     ?line {0, <<>>} = atom_to_bin('',0),
     ok.
 
-maps(doc) -> ["Test NIF maps handling."];
-maps(suite) -> [];
+%% Test NIF maps handling.
 maps(Config) when is_list(Config) ->
     TmpMem = tmpmem(),
     Pairs = [{adam, "bert"}] ++
@@ -474,8 +464,7 @@ maps(Config) when is_list(Config) ->
 
     ok.
  
-api_macros(doc) -> ["Test macros enif_make_list<N> and enif_make_tuple<N>"];
-api_macros(suite) -> [];
+%% Test macros enif_make_list<N> and enif_make_tuple<N>
 api_macros(Config) when is_list(Config) ->
     ?line ensure_lib_loaded(Config, 1),
     Expected = {[lists:seq(1,N) || N <- lists:seq(1,9)],
@@ -484,8 +473,7 @@ api_macros(Config) when is_list(Config) ->
     ?line Expected = macros(list_to_tuple(lists:seq(1,9))),
     ok.
 
-from_array(doc) -> ["enif_make_[tuple|list]_from_array"];
-from_array(suite) -> [];
+%% enif_make_[tuple|list]_from_array
 from_array(Config) when is_list(Config) ->
     ?line ensure_lib_loaded(Config, 1),
     lists:foreach(fun(Tpl) ->
@@ -495,8 +483,7 @@ from_array(Config) when is_list(Config) ->
 		  [{}, {1,2,3}, {[4,5],[],{},{6,7}}, {{}}, {[]}]),
     ok.
 
-iolist_as_binary(doc) -> ["enif_inspect_iolist_as_binary"];
-iolist_as_binary(suite) -> [];
+%% enif_inspect_iolist_as_binary
 iolist_as_binary(Config) when is_list(Config) ->
     ?line ensure_lib_loaded(Config, 1),
     TmpMem = tmpmem(),
@@ -514,8 +501,7 @@ iolist_as_binary(Config) when is_list(Config) ->
     ?line verify_tmpmem(TmpMem),
     ok.
 
-resource(doc) -> ["Test memory managed objects, aka 'resources'"];
-resource(suite) -> [];
+%% Test memory managed objects, aka 'resources'
 resource(Config) when is_list(Config) ->
     ?line ensure_lib_loaded(Config, 1),
     ?line Type = get_resource_type(0),
@@ -616,8 +602,7 @@ resource_neg_do(TypeA) ->
     ?line {'EXIT',{badarg,_}} = (catch get_resource(TypeB, ResA)),
     ok.
 
-resource_binary(doc) -> ["Test enif_make_resource_binary"];
-resource_binary(suite) -> [];
+%% Test enif_make_resource_binary
 resource_binary(Config) when is_list(Config) ->
     ?line ensure_lib_loaded(Config, 1),
     ?line {Ptr,Bin} = resource_binary_do(),
@@ -650,8 +635,7 @@ resource_binary_do() ->
 -define(RT_CREATE,1).
 -define(RT_TAKEOVER,2).
 
-resource_takeover(doc) -> ["Test resource takeover by module reload and upgrade"];
-resource_takeover(suite) -> [];  
+%% Test resource takeover by module reload and upgrade
 resource_takeover(Config) when is_list(Config) ->    
     TmpMem = tmpmem(),
     ensure_lib_loaded(Config),
@@ -1028,7 +1012,7 @@ resource_holder(Pid,Reply,List) ->
     resource_holder(List).
 
 
-threading(doc) -> ["Test the threading API functions (reuse tests from driver API)"];
+%% Test the threading API functions (reuse tests from driver API)
 threading(Config) when is_list(Config) ->
     case erlang:system_info(threads) of
     	true -> threading_do(Config);
@@ -1050,7 +1034,7 @@ threading_do(Config) ->
     ?line ok = tester:load_nif_lib(Config, "tsd"),
     ?line ok = tester:run().
 
-send(doc) -> ["Test NIF message sending"];
+%% Test NIF message sending
 send(Config) when is_list(Config) ->    
     ensure_lib_loaded(Config),
 
@@ -1075,14 +1059,14 @@ send(Config) when is_list(Config) ->
     {ok,0} = send_list_seq(7, DeadPid),
     ok.
 
-send2(doc) -> ["More NIF message sending"];
+%% More NIF message sending
 send2(Config) when is_list(Config) ->
     ensure_lib_loaded(Config),
 
     send2_do1(fun send_blob_dbg/2),
     ok.
 
-send_threaded(doc) -> ["Send msg from user thread"];
+%% Send msg from user thread
 send_threaded(Config) when is_list(Config) ->
     case erlang:system_info(smp_support) of
 	true ->
@@ -1168,7 +1152,7 @@ forwarder(To, N) ->
 other_term() ->
     {fun(X,Y) -> X*Y end, make_ref()}.
 
-send3(doc) -> ["Message sending stress test"];
+%% Message sending stress test
 send3(Config) when is_list(Config) ->
     %% Let a number of processes send random message blobs between each other
     %% using enif_send. Kill and spawn new ones randomly to keep a ~constant
@@ -1324,7 +1308,7 @@ send3_new_state(State, Blob) ->
         _ -> State  % Don't store blob
     end.
 
-neg(doc) -> ["Negative testing of load_nif"];
+%% Negative testing of load_nif
 neg(Config) when is_list(Config) ->
     TmpMem = tmpmem(),
     ?line {'EXIT',{badarg,_}} = (catch erlang:load_nif(badarg, 0)),
@@ -1339,7 +1323,7 @@ neg(Config) when is_list(Config) ->
     ?line verify_tmpmem(TmpMem),
     ?line ok.
 
-is_checks(doc) -> ["Test all enif_is functions"];
+%% Test all enif_is functions
 is_checks(Config) when is_list(Config) ->
     ?line ensure_lib_loaded(Config, 1),
     ?line ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
@@ -1374,7 +1358,7 @@ is_checks(Config) when is_list(Config) ->
             ?line ok
     end.
 
-get_length(doc) -> ["Test all enif_get_length functions"];
+%% Test all enif_get_length functions
 get_length(Config) when is_list(Config) ->
     ?line ensure_lib_loaded(Config, 1),
     ?line ok = length_test(hejsan, "hejsan", [], [], not_a_list, [1,2|3]).
@@ -1415,7 +1399,7 @@ reverse_list_test(Config) ->
     ?line RevList = reverse_list(List),
     ?line badarg = reverse_list(foo).
 
-otp_9668(doc) -> ["Memory leak of tmp-buffer when inspecting iolist or unaligned binary in unbound environment"];
+%% Memory leak of tmp-buffer when inspecting iolist or unaligned binary in unbound environment
 otp_9668(Config) ->
     ensure_lib_loaded(Config, 1),
     TmpMem = tmpmem(),
@@ -1428,7 +1412,7 @@ otp_9668(Config) ->
     ?line verify_tmpmem(TmpMem),
     ok.
 
-otp_9828(doc) -> ["Copy of writable binary"];
+%% Copy of writable binary
 otp_9828(Config) ->
     ensure_lib_loaded(Config, 1),
 
diff --git a/erts/emulator/test/node_container_SUITE.erl b/erts/emulator/test/node_container_SUITE.erl
index 191dc09670..9879e004d2 100644
--- a/erts/emulator/test/node_container_SUITE.erl
+++ b/erts/emulator/test/node_container_SUITE.erl
@@ -105,10 +105,8 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 %%
 %% Test case: term_to_binary_to_term_eq
 %%
-term_to_binary_to_term_eq(doc) ->
-    ["Tests that node container terms that are converted to external format "
-     "and back stay equal to themselves."];
-term_to_binary_to_term_eq(suite) -> [];
+%% Tests that node container terms that are converted to external format
+%% and back stay equal to themselves.
 term_to_binary_to_term_eq(Config) when is_list(Config) ->
     ?line ThisNode = {node(), erlang:system_info(creation)},
     % Get local node containers
@@ -151,10 +149,7 @@ term_to_binary_to_term_eq(Config) when is_list(Config) ->
 %%
 %% Test case: round_trip_eq
 %%
-round_trip_eq(doc) ->
-    ["Tests that node containers that are sent beteen nodes stay equal to "
-     "themselves."];
-round_trip_eq(suite) -> [];
+%% Tests that node containers that are sent beteen nodes stay equal to themselves.
 round_trip_eq(Config) when is_list(Config) ->
     ?line ThisNode = {node(), erlang:system_info(creation)},
     ?line NodeFirstName = get_nodefirstname(),
@@ -206,10 +201,7 @@ round_trip_eq(Config) when is_list(Config) ->
 %%
 %% Test case: cmp
 %%
-cmp(doc) ->
-    ["Tests that Erlang term comparison works as it should on node "
-     "containers."];
-cmp(suite) -> [];
+%% Tests that Erlang term comparison works as it should on node containers.
 cmp(Config) when is_list(Config) ->
 
     %% Inter type comparison ---------------------------------------------------
@@ -373,8 +365,7 @@ cmp(Config) when is_list(Config) ->
 %%
 %% Test case: ref_eq
 %%
-ref_eq(doc) -> ["Test that one word refs \"works\"."];
-ref_eq(suite) -> [];
+%% Test that one word refs works
 ref_eq(Config) when is_list(Config) ->
     ?line ThisNode = {node(), erlang:system_info(creation)},
     ?line AnotherNode = {get_nodename(),2},
@@ -404,9 +395,7 @@ ref_eq(Config) when is_list(Config) ->
 %%
 %% Test case: node_table_gc
 %%
-node_table_gc(doc) ->
-    ["Tests that node tables are garbage collected."];
-node_table_gc(suite) -> [];
+%% Tests that node tables are garbage collected.
 node_table_gc(Config) when is_list(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
     erts_debug:set_internal_state(node_tab_delayed_delete, 0),
@@ -474,10 +463,8 @@ make_faked_pid_list(Start, No, Creation, Acc) ->
 %%
 %% Test case: dist_link_refc
 %%
-dist_link_refc(doc) ->
-    ["Tests that external reference counts are incremented and decremented "
-     "as they should for distributed links"];
-dist_link_refc(suite) -> [];
+%% Tests that external reference counts are incremented and decremented
+%% as they should for distributed links
 dist_link_refc(Config) when is_list(Config) ->
     ?line NodeFirstName = get_nodefirstname(),
     ?line ?line {ok, Node} = start_node(NodeFirstName),
@@ -511,10 +498,8 @@ dist_link_refc(Config) when is_list(Config) ->
 %%
 %% Test case: dist_monitor_refc
 %%
-dist_monitor_refc(doc) ->
-    ["Tests that external reference counts are incremented and decremented "
-     "as they should for distributed monitors"];
-dist_monitor_refc(suite) -> [];
+%% Tests that external reference counts are incremented and decremented
+%% as they should for distributed monitors
 dist_monitor_refc(Config) when is_list(Config) ->
     ?line NodeFirstName = get_nodefirstname(),
     ?line {ok, Node} = start_node(NodeFirstName),
@@ -566,10 +551,8 @@ dist_monitor_refc(Config) when is_list(Config) ->
 %%
 %% Test case: node_controller_refc
 %%
-node_controller_refc(doc) ->
-    ["Tests that external reference counts are incremented and decremented "
-     "as they should for entities controlling a connections."];
-node_controller_refc(suite) -> [];
+%% Tests that external reference counts are incremented and decremented
+%% as they should for entities controlling a connections.
 node_controller_refc(Config) when is_list(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
     erts_debug:set_internal_state(node_tab_delayed_delete, 0),
@@ -606,10 +589,8 @@ node_controller_refc(Config) when is_list(Config) ->
 %%
 %% Test case: ets_refc
 %%
-ets_refc(doc) ->
-    ["Tests that external reference counts are incremented and decremented "
-     "as they should for data stored in ets tables."];
-ets_refc(suite) -> [];
+%% Tests that external reference counts are incremented and decremented
+%% as they should for data stored in ets tables.
 ets_refc(Config) when is_list(Config) ->
     ?line RNode = {get_nodename(), 1},
     ?line RPid = mk_pid(RNode, 4711, 2),
@@ -639,10 +620,8 @@ ets_refc(Config) when is_list(Config) ->
 %%
 %% Test case: match_spec_refc
 %%
-match_spec_refc(doc) ->
-    ["Tests that external reference counts are incremented and decremented "
-     "as they should for data stored in match specifications."];
-match_spec_refc(suite) -> [];
+%% Tests that external reference counts are incremented and decremented
+%% as they should for data stored in match specifications.
 match_spec_refc(Config) when is_list(Config) ->
     ?line RNode = {get_nodename(), 1},
     ?line RPid = mk_pid(RNode, 4711, 2),
@@ -676,10 +655,8 @@ do_match_spec_test(RNode, RPid, RPort, RRef) ->
 %%
 %% Test case: ets_refc
 %%
-timer_refc(doc) ->
-    ["Tests that external reference counts are incremented and decremented "
-     "as they should for data stored in bif timers."];
-timer_refc(suite) -> [];
+%% Tests that external reference counts are incremented and decremented
+%% as they should for data stored in bif timers.
 timer_refc(Config) when is_list(Config) ->
     ?line RNode = {get_nodename(), 1},
     ?line RPid = mk_pid(RNode, 4711, 2),
@@ -703,8 +680,6 @@ timer_refc(Config) when is_list(Config) ->
     ?line nc_refc_check(node()),
     ?line ok.
 
-otp_4715(doc) -> [];
-otp_4715(suite) -> [];
 otp_4715(Config) when is_list(Config) ->
     case test_server:is_release_available("r9b") of
 	true -> otp_4715_1(Config);
@@ -734,12 +709,8 @@ run_otp_4715(Config) when is_list(Config) ->
     ?line R9Sorted = old_mod:sort_on_old_node(PidList),
     ?line R9Sorted = lists:sort(PidList).
 
-pid_wrap(doc) -> [];
-pid_wrap(suite) -> [];
 pid_wrap(Config) when is_list(Config) -> ?line pp_wrap(pid).
 
-port_wrap(doc) -> [];
-port_wrap(suite) -> [];
 port_wrap(Config) when is_list(Config) ->
     ?line case test_server:os_type() of
 	      {unix, _} ->
@@ -810,8 +781,6 @@ do_pp_creations(port, N) when is_integer(N) ->
     ?line "hej" = os:cmd("echo hej") -- "\n",
     ?line do_pp_creations(port, N - 1).
 
-bad_nc(doc) -> [];
-bad_nc(suite) -> [];
 bad_nc(Config) when is_list(Config) ->
     % Make sure emulator don't crash on bad node containers...
     ?line MaxPidNum = (1 bsl 15) - 1,
@@ -851,8 +820,6 @@ bad_nc(Config) when is_list(Config) ->
 
 -define(NO_PIDS, 1000000).
 
-unique_pid(doc) -> [];
-unique_pid(suite) -> [];
 unique_pid(Config) when is_list(Config) ->
     case catch erlang:system_info(modified_timing_level) of
 	Level when is_integer(Level) ->
@@ -869,8 +836,6 @@ mkpidlist(0, Ps) -> Ps;
 mkpidlist(N, Ps) -> mkpidlist(N-1, [spawn(fun () -> ok end)|Ps]).
 
 
-iter_max_procs(doc) -> [];
-iter_max_procs(suite) -> [];
 iter_max_procs(Config) when is_list(Config) ->
     ?line NoMoreTests = make_ref(),
     ?line erlang:send_after(10000, self(), NoMoreTests),
diff --git a/erts/emulator/test/old_scheduler_SUITE.erl b/erts/emulator/test/old_scheduler_SUITE.erl
index 612487cd35..99c143e2d0 100644
--- a/erts/emulator/test/old_scheduler_SUITE.erl
+++ b/erts/emulator/test/old_scheduler_SUITE.erl
@@ -84,8 +84,6 @@ ok(Config) when is_list(Config) ->
 
 %% Run equal number of low and normal prio processes.
 
-equal(suite) -> [];
-equal(doc) -> [];
 equal(Config) when is_list(Config) ->
     ?line Self = self(),
 
@@ -125,8 +123,6 @@ equal(Config) when is_list(Config) ->
 
 %% Run many low and few normal prio processes.
 
-many_low(suite) -> [];
-many_low(doc) -> [];
 many_low(Config) when is_list(Config) ->
     ?line Self = self(),
     Normal = {normal,1},
@@ -156,8 +152,6 @@ many_low(Config) when is_list(Config) ->
 
 %% Run few low and many normal prio processes.
 
-few_low(suite) -> [];
-few_low(doc) -> [];
 few_low(Config) when is_list(Config) ->
     ?line Self = self(),
     Normal = {normal,1000},
@@ -188,8 +182,6 @@ few_low(Config) when is_list(Config) ->
 %% Run max prio processes and verify they get at least as much 
 %% runtime as high, normal and low.
 
-max(suite) -> [];
-max(doc) -> [];
 max(Config) when is_list(Config) ->
     max = process_flag(priority, max),		% should already be max (init_per_tc)
     ?line Self = self(),
@@ -259,8 +251,6 @@ max(Config) when is_list(Config) ->
 %% Run high prio processes and verify they get at least as much 
 %% runtime as normal and low.
 
-high(suite) -> [];
-high(doc) -> [];
 high(Config) when is_list(Config) ->
     max = process_flag(priority, max),		% should already be max (init_per_tc)
     ?line Self = self(),
diff --git a/erts/emulator/test/op_SUITE.erl b/erts/emulator/test/op_SUITE.erl
index 70e0c57827..e9127616a6 100644
--- a/erts/emulator/test/op_SUITE.erl
+++ b/erts/emulator/test/op_SUITE.erl
@@ -43,7 +43,7 @@ bsl_bsr(Config) when is_list(Config) ->
     ?line run_test_module(Cases, false),
     {comment,integer_to_list(length(Cases)) ++ " cases"}.
 
-logical(doc) -> "Test the logical operators and internal BIFs.";
+%% Test the logical operators and internal BIFs.
 logical(Config) when is_list(Config) ->
     Vs0 = [true,false,bad],
     Vs = [unvalue(V) || V <- Vs0],
@@ -51,13 +51,13 @@ logical(Config) when is_list(Config) ->
     ?line run_test_module(Cases, false),
     {comment,integer_to_list(length(Cases)) ++ " cases"}.
 
-t_not(doc) -> "Test the not operator and internal BIFs.";
+%% Test the not operator and internal BIFs.
 t_not(Config) when is_list(Config) ->
     ?line Cases = [{'not',unvalue(V)} || V <- [true,false,42,bad]],
     ?line run_test_module(Cases, false),
     {comment,integer_to_list(length(Cases)) ++ " cases"}.
 
-relop_simple(doc) -> "Test that simlpe relations between relation operators hold.";
+%% Test that simlpe relations between relation operators hold.
 relop_simple(Config) when is_list(Config) ->
     Big1 = 19738924729729787487784874,
     Big2 = 38374938373887374983978484,
@@ -207,7 +207,7 @@ purify_list([H|T], Acc) -> purify_list(T, [H|Acc]);
 purify_list(Other, Acc) -> [Other|Acc].
     
 
-relop(doc) -> "Test the relational operators and internal BIFs on literals.";
+%% Test the relational operators and internal BIFs on literals.
 relop(Config) when is_list(Config) ->
     Big1 = -38374938373887374983978484,
     Big2 = 19738924729729787487784874,
@@ -218,8 +218,7 @@ relop(Config) when is_list(Config) ->
     Ops = ['==', '/=', '=:=', '=/=', '<', '=<', '>', '>='],
     ?line binop(Ops, Vs).
 
-complex_relop(doc) ->
-    "Test the relational operators and internal BIFs on lists and tuples.";
+%% Test the relational operators and internal BIFs on lists and tuples.
 complex_relop(Config) when is_list(Config) ->
     Big = 99678557475484872464269855544643333,
     Float = float(Big),
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index 563b311f5f..7d881a483f 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -243,9 +243,8 @@ slow_writes(Config) when is_list(Config) ->
     ping(Config, [10], 2, "-s2", []),
     ok.
 
-bad_packet(doc) ->
-    ["Test that we get {'EXIT', Port, einval} if we try to send a bigger "
-     "packet than the packet header allows."];
+%% Test that we get {'EXIT', Port, einval} if we try to send a bigger
+%% packet than the packet header allows.
 bad_packet(Config) when is_list(Config) ->
     PortTest = port_test(Config),
     process_flag(trap_exit, true),
@@ -454,7 +453,6 @@ wait_for(Pids) ->
 %% Tests starting port programs that terminate by themselves.
 %% This used to cause problems on Windows.
 
-dying_port(suite) -> [];
 dying_port(Config) when is_list(Config) ->
     ct:timetrap({minutes, 2}),
     process_flag(trap_exit, true),
@@ -501,7 +499,6 @@ make_dying_port(Config) when is_list(Config) ->
 %%
 %% This testcase works on Unix, but is not very useful.
 
-port_program_with_path(suite) -> [];
 port_program_with_path(Config) when is_list(Config) ->
     ct:timetrap({minutes, 2}),
     DataDir = proplists:get_value(data_dir, Config),
@@ -543,7 +540,6 @@ port_program_with_path(Config) when is_list(Config) ->
 
 %% Tests that files can be read using open_port(Filename, [in]).
 %% This used to fail on Windows.
-open_input_file_port(suite) -> [];
 open_input_file_port(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     
@@ -563,7 +559,6 @@ open_input_file_port(Config) when is_list(Config) ->
     ok.
 
 %% Tests that files can be written using open_port(Filename, [out]).
-open_output_file_port(suite) -> [];
 open_output_file_port(Config) when is_list(Config) ->
     ct:timetrap({minutes, 2}),
     PrivDir = proplists:get_value(priv_dir, Config),
@@ -584,7 +579,6 @@ open_output_file_port(Config) when is_list(Config) ->
     ok.
 
 %% Tests that all appropriate fd's have been closed in the port program
-count_fds(suite) -> [];
 count_fds(Config) when is_list(Config) ->
     case os:type() of
         {unix, _} ->
@@ -620,7 +614,6 @@ count_fds(Config) when is_list(Config) ->
 %% that we get the same number of ports every time.
 %%
 
-iter_max_ports(suite) -> [];
 iter_max_ports(Config) when is_list(Config) ->
     %% The child_setup program might dump core if we get out of memory.
     %% This is hard to do anything about and is harmless. We run this test
@@ -716,7 +709,6 @@ open_ports(Name, Settings) ->
 
 %% Tests that exit(Port, Term) works (has been known to crash the emulator).
 
-t_exit(suite) -> [];
 t_exit(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     Pid = fun_spawn(fun suicide_port/1, [Config]),
@@ -733,13 +725,9 @@ suicide_port(Config) when is_list(Config) ->
     receive after infinity -> ok end.
 
 
-tps_16_bytes(doc) -> "";
-tps_16_bytes(suite) -> [];
 tps_16_bytes(Config) when is_list(Config) ->
     tps(16, Config).
 
-tps_1K(doc) -> "";
-tps_1K(suite) -> [];
 tps_1K(Config) when is_list(Config) ->
     tps(1024, Config).
 
@@ -807,11 +795,7 @@ line(Config) when is_list(Config) ->
     bad_argument(Config, [{packet, 5}, {line, 5}]),
     ok.
 
-%%% Redirection of stderr test
-stderr_to_stdout(suite) ->
-    [];
-stderr_to_stdout(doc) ->
-    "Test that redirection of standard error to standard output works.";
+%% Test that redirection of standard error to standard output works.
 stderr_to_stdout(Config) when is_list(Config) ->
     ct:timetrap({minutes, 1}),
     %% See that it works
@@ -835,10 +819,8 @@ bad_argument(Config, ArgList) ->
 %% 'env' option
 %% (Can perhaps be made smaller by calling the other utility functions
 %% in this module.)
-env(suite) ->
-    [];
-env(doc) ->
-    ["Test that the 'env' option works"];
+%%
+%% Test that the 'env' option works
 env(Config)  when is_list(Config) ->
     ct:timetrap({minutes, 1}),
     Priv = proplists:get_value(priv_dir, Config),
@@ -967,10 +949,8 @@ huge_env(Config) when is_list(Config) ->
 %% 'cd' option
 %% (Can perhaps be made smaller by calling the other utility functions
 %% in this module.)
-cd(suite) ->
-    [];
-cd(doc) ->
-    ["Test that the 'cd' option works"];
+%%
+%% Test that the 'cd' option works
 cd(Config)  when is_list(Config) ->
     ct:timetrap({minutes, 1}),
 
@@ -1036,11 +1016,8 @@ tolower(C) when C >= $A, C =< $Z ->
 tolower(C) ->
     C.
 
-otp_3906(suite) ->
-    [];
-otp_3906(doc) ->
-    ["Tests that child process deaths are managed correctly when there are "
-     " a large amount of concurrently dying children. See ticket OTP-3906."];
+%% Tests that child process deaths are managed correctly when there are
+%%  a large amount of concurrently dying children. See ticket OTP-3906.
 otp_3906(Config)  when is_list(Config) ->
     case os:type() of
 	{unix, OSName} ->
@@ -1239,8 +1216,6 @@ otp_3906_forker(N, Parent, Ref, Sup, Prog) ->
     end.
 
 
-otp_4389(suite) -> [];
-otp_4389(doc) -> [];
 otp_4389(Config)  when is_list(Config) ->
     case os:type() of
 	{unix, _} ->
@@ -1314,10 +1289,8 @@ get_true_cmd() ->
  	  end.
 
 %% 'exit_status' option
-exit_status(suite) ->
-    [];
-exit_status(doc) ->
-    ["Test that the 'exit_status' option works"];
+%%
+%% Test that the 'exit_status' option works
 exit_status(Config)  when is_list(Config) ->
     ct:timetrap({minutes, 1}),
     port_expect(Config,
@@ -1325,10 +1298,7 @@ exit_status(Config)  when is_list(Config) ->
                 1, "", [exit_status]),
     ok.
 
-spawn_driver(suite) ->
-    [];
-spawn_driver(doc) ->
-    ["Test spawning a driver specifically"];
+%% Test spawning a driver specifically
 spawn_driver(Config) when is_list(Config) ->
     Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "echo_drv"),
@@ -1360,10 +1330,7 @@ spawn_driver(Config) when is_list(Config) ->
     {'EXIT',{badarg,_}} = (catch erlang:open_port({spawn_driver, os:find_executable("erl")}, [])),
     ok.
 
-parallelism_option(suite) ->
-    [];
-parallelism_option(doc) ->
-    ["Test parallelism option of open_port"];
+%% Test parallelism option of open_port
 parallelism_option(Config) when is_list(Config) ->
     ?line Path = proplists:get_value(data_dir, Config),
     ?line ok = load_driver(Path, "echo_drv"),
@@ -1395,10 +1362,7 @@ parallelism_option(Config) when is_list(Config) ->
     ?line receive {Port2, closed} -> ok end,
     ok.
 
-spawn_executable(suite) ->
-    [];
-spawn_executable(doc) ->
-    ["Test spawning an executable specifically"];
+%% Test spawning an executable specifically
 spawn_executable(Config) when is_list(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
     EchoArgs1 = filename:join([DataDir,"echo_args"]),
@@ -1635,10 +1599,7 @@ collect_data(Port) ->
 parse_echo_args_output(Data) ->
     [lists:last(string:tokens(S,"|")) || S <- string:tokens(Data,"\r\n")].
 
-mix_up_ports(suite) ->
-    [];
-mix_up_ports(doc) ->
-    ["Test that the emulator does not mix up ports when the port table wraps"];
+%% Test that the emulator does not mix up ports when the port table wraps
 mix_up_ports(Config) when is_list(Config) ->
     Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "echo_drv"),
@@ -1680,11 +1641,8 @@ loop(Start, Stop, Fun) when is_function(Fun) ->
     loop(Fun(Start), Stop, Fun).
 
 
-otp_5112(suite) ->
-    [];
-otp_5112(doc) ->
-    ["Test that link to connected process is taken away when port calls",
-     "driver_exit() also when the port index has wrapped"];
+%% Test that link to connected process is taken away when port calls
+%% driver_exit() also when the port index has wrapped
 otp_5112(Config) when is_list(Config) ->
     Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "exit_drv"),
@@ -1727,10 +1685,7 @@ otp_5112_wrap_port_ix(Ports) ->
 	  end.
 
 
-otp_5119(suite) ->
-    [];
-otp_5119(doc) ->
-    ["Test that port index is not unnecessarily wrapped"];
+%% Test that port index is not unnecessarily wrapped
 otp_5119(Config) when is_list(Config) ->
     Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "exit_drv"),
@@ -1773,8 +1728,7 @@ port_ix(Port) when is_port(Port) ->
     list_to_integer(PortIxStr).
 
 
-otp_6224(doc) -> ["Check that port command failure doesn't crash the emulator"];
-otp_6224(suite) -> [];
+%% Check that port command failure doesn't crash the emulator
 otp_6224(Config) when is_list(Config) ->
     Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "failure_drv"),
@@ -1807,8 +1761,6 @@ otp_6224_loop() ->
 -define(EXIT_STATUS_MSB_MAX_PROCS, 64).
 -define(EXIT_STATUS_MSB_MAX_PORTS, 300).
 
-exit_status_multi_scheduling_block(doc) -> [];
-exit_status_multi_scheduling_block(suite) -> [];
 exit_status_multi_scheduling_block(Config) when is_list(Config) ->
     Repeat = 3,
     case test_server:os_type() of
@@ -2225,9 +2177,7 @@ fun_spawn(Fun, Args) ->
 port_test(Config) when is_list(Config) ->
     filename:join(proplists:get_value(data_dir, Config), "port_test").
 
-
-ports(doc) -> "Test that erlang:ports/0 returns a consistent snapshot of ports";
-ports(suite) -> [];
+%% Test that erlang:ports/0 returns a consistent snapshot of ports
 ports(Config) when is_list(Config) ->
     Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "exit_drv"),
@@ -2334,9 +2284,8 @@ load_driver(Dir, Driver) ->
     end.
 
 
-close_deaf_port(doc) -> ["Send data to port program that does not read it, then close port."
-			 "Primary targeting Windows to test threaded_handle_closer in sys.c"];
-close_deaf_port(suite) -> [];
+%% Send data to port program that does not read it, then close port.
+%% Primary targeting Windows to test threaded_handle_closer in sys.c
 close_deaf_port(Config) when is_list(Config) ->
     ct:timetrap({minutes, 2}),
     DataDir = proplists:get_value(data_dir, Config),
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index 7df7fb516d..5bb216ff79 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_SUITE.erl
@@ -659,10 +659,6 @@ chk_pi_order([],[]) ->
 chk_pi_order([{Arg, _}| Values], [Arg|Args]) ->
     chk_pi_order(Values, Args).
 
-process_info_2_list(doc) ->
-    [];
-process_info_2_list(suite) ->
-    [];
 process_info_2_list(Config) when is_list(Config) ->
     Proc = spawn(fun () -> receive after infinity -> ok end end),
     register(process_SUITE_process_info_2_list1, self()),
@@ -695,10 +691,6 @@ process_info_2_list(Config) when is_list(Config) ->
     lists:foreach(fun ({backtrace, _}) -> ok end, V3),
     ok.
     
-process_info_lock_reschedule(doc) ->
-    [];
-process_info_lock_reschedule(suite) ->
-    [];
 process_info_lock_reschedule(Config) when is_list(Config) ->
     %% We need a process that is running and an item that requires
     %% process_info to take the main process lock.
@@ -740,10 +732,6 @@ pi_loop(Name, Pid, N) ->
     {registered_name, Name} = process_info(Pid, registered_name),
     pi_loop(Name, Pid, N-1).
 
-process_info_lock_reschedule2(doc) ->
-    [];
-process_info_lock_reschedule2(suite) ->
-    [];
 process_info_lock_reschedule2(Config) when is_list(Config) ->
     Parent = self(),
     Fun = fun () ->
@@ -799,10 +787,6 @@ do_pi_msg_len(PT, AT) ->
     lists:map(fun (_) -> ok end, [a,b,c,d]),
     {message_queue_len, _} = process_info(element(2,PT), element(2,AT)).
     
-process_info_lock_reschedule3(doc) ->
-    [];
-process_info_lock_reschedule3(suite) ->
-    [];
 process_info_lock_reschedule3(Config) when is_list(Config) ->
     %% We need a process that is running and an item that requires
     %% process_info to take the main process lock.
@@ -1067,8 +1051,7 @@ make_unaligned_sub_binary(Bin0) ->
     <<0:3,Bin:Sz/binary,31:5>> = id(Bin1),
     Bin.
 
-yield(doc) ->
-    "Tests erlang:yield/1.";
+%% Tests erlang:yield/1
 yield(Config) when is_list(Config) ->
     case catch erlang:system_info(modified_timing_level) of
 	Level when is_integer(Level) ->
@@ -1146,8 +1129,6 @@ schedcnt(stop, {Ref, Pid}) when is_reference(Ref), is_pid(Pid) ->
 	    Cnt
     end.
 
-yield2(doc) -> [];
-yield2(suite) -> [];
 yield2(Config) when is_list(Config) ->
     Me = self(),
     Go = make_ref(),
@@ -1239,8 +1220,6 @@ fail_register(Name, Process) ->
     {'EXIT',{badarg,_}} = (catch Name ! anything_goes),
     ok.
 
-garbage_collect(doc) -> [];
-garbage_collect(suite) -> [];
 garbage_collect(Config) when is_list(Config) ->
     Prio = process_flag(priority, high),
     true = erlang:garbage_collect(),
@@ -1279,10 +1258,7 @@ garbage_collect(Config) when is_list(Config) ->
     process_flag(priority, Prio),
     ok.
 
-process_info_messages(doc) ->
-    ["This used to cause the nofrag emulator to dump core"];
-process_info_messages(suite) ->
-    [];
+%% This used to cause the nofrag emulator to dump core
 process_info_messages(Config) when is_list(Config) ->
     process_info_messages_test(),
     ok.
@@ -1340,10 +1316,6 @@ process_info_messages_test() ->
 chk_badarg(Fun) ->
     try Fun(), exit(no_badarg) catch error:badarg -> ok end.
 
-process_flag_badarg(doc) ->
-    [];
-process_flag_badarg(suite) ->
-    [];
 process_flag_badarg(Config) when is_list(Config) ->
     chk_badarg(fun () -> process_flag(gurka, banan) end),
     chk_badarg(fun () -> process_flag(trap_exit, gurka) end),
@@ -1361,8 +1333,6 @@ process_flag_badarg(Config) when is_list(Config) ->
 
 -include_lib("stdlib/include/ms_transform.hrl").
 
-otp_6237(doc) -> [];
-otp_6237(suite) -> [];
 otp_6237(Config) when is_list(Config) ->
     Slctrs = lists:map(fun (_) ->
 		spawn_link(fun () ->
@@ -1429,10 +1399,6 @@ otp_6237_select_loop() ->
 			     conses_per_red,
 			     debug_level}).
 
-processes_large_tab(doc) ->
-    [];
-processes_large_tab(suite) ->
-    [];
 processes_large_tab(Config) when is_list(Config) ->
     sys_mem_cond_run(2048, fun () -> processes_large_tab_test(Config) end).
 
@@ -1483,10 +1449,6 @@ processes_large_tab_test(Config) ->
     stop_node(LargeNode),
     chk_processes_bif_test_res(Res).
 
-processes_default_tab(doc) ->
-    [];
-processes_default_tab(suite) ->
-    [];
 processes_default_tab(Config) when is_list(Config) ->
     sys_mem_cond_run(1024, fun () -> processes_default_tab_test(Config) end).
 
@@ -1496,10 +1458,6 @@ processes_default_tab_test(Config) ->
     stop_node(DefaultNode),
     chk_processes_bif_test_res(Res).
 
-processes_small_tab(doc) ->
-    [];
-processes_small_tab(suite) ->
-    [];
 processes_small_tab(Config) when is_list(Config) ->
     {ok, SmallNode} = start_node(Config, "+P 1024"),
     Res    = rpc:call(SmallNode, ?MODULE, processes_bif_test, []),
@@ -1508,10 +1466,6 @@ processes_small_tab(Config) when is_list(Config) ->
     true = PBInfo#ptab_list_bif_info.tab_chunks < 10,
     chk_processes_bif_test_res(Res).
 
-processes_this_tab(doc) ->
-    [];
-processes_this_tab(suite) ->
-    [];
 processes_this_tab(Config) when is_list(Config) ->
     Mem = case {erlang:system_info(build_type),
                 erlang:system_info(allocator)} of
@@ -1874,10 +1828,6 @@ wait_until_system_recover(Tmr) ->
     receive {timeout, Tmr, _} -> ok after 0 -> ok end,
     ok.
 
-processes_last_call_trap(doc) ->
-    [];
-processes_last_call_trap(suite) ->
-    [];
 processes_last_call_trap(Config) when is_list(Config) ->
     enable_internal_state(),
     Processes = fun () -> processes() end,
@@ -1900,10 +1850,6 @@ processes_last_call_trap(Config) when is_list(Config) ->
 my_processes() ->
     processes().
 
-processes_apply_trap(doc) ->
-    [];
-processes_apply_trap(suite) ->
-    [];
 processes_apply_trap(Config) when is_list(Config) ->
     enable_internal_state(),
     PBInfo = erts_debug:get_internal_state(processes_bif_info),
@@ -1918,10 +1864,6 @@ processes_apply_trap(Config) when is_list(Config) ->
 		apply(erlang, processes, [])
 	end, lists:seq(1,100)).
 
-processes_gc_trap(doc) ->
-    [];
-processes_gc_trap(suite) ->
-    [];
 processes_gc_trap(Config) when is_list(Config) ->
     Tester = self(),
     enable_internal_state(),
@@ -1960,10 +1902,6 @@ processes_gc_trap(Config) when is_list(Config) ->
     exit(Suspendee, bang),
     ok.
 
-process_flag_heap_size(doc) ->
-    [];
-process_flag_heap_size(suite) ->
-    [];
 process_flag_heap_size(Config) when is_list(Config) ->
     HSize  = 2586,   % must be gc fib+ number
     VHSize = 318187, % must be gc fib+ number
@@ -1975,10 +1913,6 @@ process_flag_heap_size(Config) when is_list(Config) ->
     VHSize = erlang:process_flag(min_bin_vheap_size, OldVHmin),
     ok.
 
-spawn_opt_heap_size(doc) ->
-    [];
-spawn_opt_heap_size(suite) ->
-    [];
 spawn_opt_heap_size(Config) when is_list(Config) ->
     HSize  = 987,   % must be gc fib+ number
     VHSize = 46422, % must be gc fib+ number
@@ -1989,10 +1923,6 @@ spawn_opt_heap_size(Config) when is_list(Config) ->
     Pid ! stop,
     ok.
 
-processes_term_proc_list(doc) ->
-    [];
-processes_term_proc_list(suite) ->
-    [];
 processes_term_proc_list(Config) when is_list(Config) ->
     Tester = self(),
     as_expected = processes_term_proc_list_test(false),
@@ -2142,24 +2072,12 @@ processes_term_proc_list_test(MustChk) ->
     as_expected.
 
 
-otp_7738_waiting(doc) ->
-    [];
-otp_7738_waiting(suite) ->
-    [];
 otp_7738_waiting(Config) when is_list(Config) ->
     otp_7738_test(waiting).
 
-otp_7738_suspended(doc) ->
-    [];
-otp_7738_suspended(suite) ->
-    [];
 otp_7738_suspended(Config) when is_list(Config) ->
     otp_7738_test(suspended).
 
-otp_7738_resume(doc) ->
-    [];
-otp_7738_resume(suite) ->
-    [];
 otp_7738_resume(Config) when is_list(Config) ->
     otp_7738_test(resume).
 
diff --git a/erts/emulator/test/ref_SUITE.erl b/erts/emulator/test/ref_SUITE.erl
index e84d53a89e..e792410edf 100644
--- a/erts/emulator/test/ref_SUITE.erl
+++ b/erts/emulator/test/ref_SUITE.erl
@@ -34,7 +34,7 @@ suite() ->
 all() -> 
     [wrap_1].
 
-wrap_1(doc) -> "Check that refs don't wrap around easily.";
+%% Check that refs don't wrap around easily.
 wrap_1(Config) when is_list(Config) ->
     ?line spawn_link(?MODULE, loop_ref, [self()]),
     ?line receive
diff --git a/erts/emulator/test/save_calls_SUITE.erl b/erts/emulator/test/save_calls_SUITE.erl
index fdf6e6fda0..3dfd9a16a8 100644
--- a/erts/emulator/test/save_calls_SUITE.erl
+++ b/erts/emulator/test/save_calls_SUITE.erl
@@ -73,10 +73,7 @@ init_per_testcase(_,Config) ->
 end_per_testcase(_,_Config) ->
     ok.
 
-dont_break_reductions(suite) ->
-    [];
-dont_break_reductions(doc) ->
-    ["Check that save_calls dont break reduction-based scheduling"];
+%% Check that save_calls dont break reduction-based scheduling
 dont_break_reductions(Config) when is_list(Config) ->
     ?line RPS1 = reds_per_sched(0),
     ?line RPS2 = reds_per_sched(20),
@@ -125,7 +122,7 @@ trace_handler(Acc,Parent,Client) ->
 	    ok
     end.
 
-save_calls_1(doc) -> "Test call saving.";
+%% Test call saving.
 save_calls_1(Config) when is_list(Config) ->
     case test_server:is_native(?MODULE) of
 	true -> {skipped,"Native code"};
diff --git a/erts/emulator/test/signal_SUITE.erl b/erts/emulator/test/signal_SUITE.erl
index ac6c96a02c..f8e9bc5ac0 100644
--- a/erts/emulator/test/signal_SUITE.erl
+++ b/erts/emulator/test/signal_SUITE.erl
@@ -79,9 +79,8 @@ all() ->
      pending_exit_process_info_2, pending_exit_group_leader,
      exit_before_pending_exit].
 
-xm_sig_order(doc) -> ["Test that exit signals and messages are received "
-		      "in correct order"];
-xm_sig_order(suite) -> [];
+
+%% Test that exit signals and messages are received in correct order
 xm_sig_order(Config) when is_list(Config) ->
     ?line LNode = node(),
     ?line repeat(fun () -> xm_sig_order_test(LNode) end, 1000),
@@ -114,13 +113,9 @@ xm_sig_order_proc() ->
     end,
     xm_sig_order_proc().
 
-pending_exit_unlink_process(doc) -> [];
-pending_exit_unlink_process(suite) -> [];
 pending_exit_unlink_process(Config) when is_list(Config) ->
     ?line pending_exit_test(self(), unlink).
 
-pending_exit_unlink_dist_process(doc) -> [];
-pending_exit_unlink_dist_process(suite) -> [];
 pending_exit_unlink_dist_process(Config) when is_list(Config) ->
     ?line {ok, Node} = start_node(Config),
     ?line From = spawn(Node, fun () -> receive after infinity -> ok end end),
@@ -128,28 +123,18 @@ pending_exit_unlink_dist_process(Config) when is_list(Config) ->
     ?line stop_node(Node),
     ?line Res.
 
-pending_exit_unlink_port(doc) -> [];
-pending_exit_unlink_port(suite) -> [];
 pending_exit_unlink_port(Config) when is_list(Config) ->
     ?line pending_exit_test(hd(erlang:ports()), unlink).
 
-pending_exit_trap_exit(doc) -> [];
-pending_exit_trap_exit(suite) -> [];
 pending_exit_trap_exit(Config) when is_list(Config) ->
     ?line pending_exit_test(self(), trap_exit).
 
-pending_exit_receive(doc) -> [];
-pending_exit_receive(suite) -> [];
 pending_exit_receive(Config) when is_list(Config) ->
     ?line pending_exit_test(self(), 'receive').
 
-pending_exit_exit(doc) -> [];
-pending_exit_exit(suite) -> [];
 pending_exit_exit(Config) when is_list(Config) ->
     ?line pending_exit_test(self(), exit).
 
-pending_exit_gc(doc) -> [];
-pending_exit_gc(suite) -> [];
 pending_exit_gc(Config) when is_list(Config) ->
     ?line pending_exit_test(self(), gc).
 
@@ -225,8 +210,6 @@ pending_exit_test(From, Type) ->
 
 
 
-exit_before_pending_exit(doc) -> [];
-exit_before_pending_exit(suite) -> [];
 exit_before_pending_exit(Config) when is_list(Config) ->
     %% This is a testcase testcase very specific to the smp
     %% implementation as it is of the time of writing.
diff --git a/erts/emulator/test/statistics_SUITE.erl b/erts/emulator/test/statistics_SUITE.erl
index 8279d374ee..af55ded470 100644
--- a/erts/emulator/test/statistics_SUITE.erl
+++ b/erts/emulator/test/statistics_SUITE.erl
@@ -78,9 +78,8 @@ end_per_group(_GroupName, Config) ->
 
 %%% Testing statistics(wall_clock).
 
-wall_clock_zero_diff(doc) ->
-    "Tests that the 'Wall clock since last call' element of the result "
-    "is zero when statistics(runtime) is called twice in succession.";
+%% Tests that the 'Wall clock since last call' element of the result
+%% is zero when statistics(runtime) is called twice in succession.
 wall_clock_zero_diff(Config) when is_list(Config) ->
     wall_clock_zero_diff1(16).
 
@@ -93,10 +92,9 @@ wall_clock_zero_diff1(N) when N > 0 ->
 wall_clock_zero_diff1(0) ->
     ct:fail("Difference never zero.").
 
-wall_clock_update(doc) ->
-    "Test that the time differences returned by two calls to "
-    "statistics(wall_clock) are compatible, and are within a small number "
-    "of ms of the amount of real time we waited for.";
+%% Test that the time differences returned by two calls to
+%% statistics(wall_clock) are compatible, and are within a small number
+%% of ms of the amount of real time we waited for.
 wall_clock_update(Config) when is_list(Config) ->
     wall_clock_update1(6).
 
@@ -122,9 +120,8 @@ wall_clock_update1(0) ->
 %%% Test statistics(runtime).
 
 
-runtime_zero_diff(doc) ->
-    "Tests that the difference between the times returned from two consectuitive "
-	"calls to statistics(runtime) is zero.";
+%% Tests that the difference between the times returned from two consectuitive
+%% calls to statistics(runtime) is zero.
 runtime_zero_diff(Config) when is_list(Config) ->
     ?line runtime_zero_diff1(16).
 
@@ -137,10 +134,9 @@ runtime_zero_diff1(N) when N > 0 ->
 runtime_zero_diff1(0) ->
     ct:fail("statistics(runtime) never returned zero difference").
 
-runtime_update(doc) ->
-    "Test that the statistics(runtime) returns a substanstially "
-	"updated difference after running a process that takes all CPU "
-	" power of the Erlang process for a second.";
+%% Test that the statistics(runtime) returns a substanstially
+%% updated difference after running a process that takes all CPU
+%% power of the Erlang process for a second.
 runtime_update(Config) when is_list(Config) ->
     case test_server:is_cover() of
 	false ->
@@ -167,10 +163,9 @@ do_runtime_update(N) ->
 cpu_heavy() ->
     cpu_heavy().
 
-runtime_diff(doc) ->
-    "Test that the difference between two consecutive absolute runtimes is "
-    "equal to the last relative runtime. The loop runs a lot of times since "
-    "the bug which this test case tests for showed up only rarely.";
+%% Test that the difference between two consecutive absolute runtimes is
+%% equal to the last relative runtime. The loop runs a lot of times since
+%% the bug which this test case tests for showed up only rarely.
 runtime_diff(Config) when is_list(Config) ->
     runtime_diff1(1000).
 
@@ -196,10 +191,9 @@ do_much(N) ->
     do_much(N-1).
 
 
-reductions(doc) ->
-    "Test that statistics(reductions) is callable, and that "
-	"Total_Reductions and Reductions_Since_Last_Call make sense. "
-	"(This to fail on pre-R3A version of JAM.";
+%% Test that statistics(reductions) is callable, and that
+%% Total_Reductions and Reductions_Since_Last_Call make sense.
+%% This to fail on pre-R3A version of JAM.
 reductions(Config) when is_list(Config) ->
     {Reductions, _} = statistics(reductions),
 
@@ -227,8 +221,7 @@ build_some_garbage() ->
     %% a garbage collection in the scheduler.
     processes().
 
-reductions_big(doc) ->
-    "Test that the number of reductions can be returned as a big number.";
+%% Test that the number of reductions can be returned as a big number.
 reductions_big(Config) when is_list(Config) ->
     ?line reductions_big_loop(),
     ok.
@@ -246,9 +239,8 @@ reductions_big_loop() ->
 %%% Tests of statistics(run_queue).
 
 
-run_queue_one(doc) ->
-    "Tests that statistics(run_queue) returns 1 if we start a "
-    "CPU-bound process.";
+%% Tests that statistics(run_queue) returns 1 if we start a
+%% CPU-bound process.
 run_queue_one(Config) when is_list(Config) ->
     ?line MS = erlang:system_flag(multi_scheduling, block),
     ?line run_queue_one_test(Config),
@@ -294,8 +286,7 @@ hog_iter(0, Mon) ->
 
 %%% Tests of statistics(scheduler_wall_time).
 
-scheduler_wall_time(doc) ->
-    "Tests that statistics(scheduler_wall_time) works as intended";
+%% Tests that statistics(scheduler_wall_time) works as intended
 scheduler_wall_time(Config) when is_list(Config) ->
     %% Should return undefined if system_flag is not turned on yet
     undefined = statistics(scheduler_wall_time),
@@ -360,9 +351,8 @@ load_percentage([{Id, WN, TN}|Ss], [{Id, WP, TP}|Ps]) ->
 load_percentage([], []) -> [].
 
 
-garbage_collection(doc) ->
-    "Tests that statistics(garbage_collection) is callable. "
-    "It is not clear how to test anything more.";
+%% Tests that statistics(garbage_collection) is callable.
+%% It is not clear how to test anything more.
 garbage_collection(Config) when is_list(Config) ->
     ?line Bin = list_to_binary(lists:duplicate(19999, 42)),
     ?line case statistics(garbage_collection) of
@@ -387,16 +377,14 @@ garbage_collection_1(Gcs0, Bin) ->
 	    end
     end.
 
-io(doc) ->
-    "Tests that statistics(io) is callable. "
-    "This could be improved to test something more.";
+%% Tests that statistics(io) is callable.
+%% This could be improved to test something more.
 io(Config) when is_list(Config) ->
     ?line case statistics(io) of
 	      {{input,In},{output,Out}} when is_integer(In), is_integer(Out) -> ok
 	  end.
 
-badarg(doc) ->
-    "Tests that some illegal arguments to statistics fails.";
+%% Tests that some illegal arguments to statistics fails.
 badarg(Config) when is_list(Config) ->
     ?line case catch statistics(1) of
 	      {'EXIT', {badarg, _}} -> ok
@@ -465,8 +453,7 @@ run_queues_lengths_active_tasks(Config) ->
 
     ok.
 
-msacc(doc) ->
-    "Tests that statistics(microstate_statistics) works.";
+%% Tests that statistics(microstate_statistics) works.
 msacc(Config) ->
 
     %% Test if crypto nif is available
diff --git a/erts/emulator/test/system_info_SUITE.erl b/erts/emulator/test/system_info_SUITE.erl
index 7d66ea5c5b..71145d4595 100644
--- a/erts/emulator/test/system_info_SUITE.erl
+++ b/erts/emulator/test/system_info_SUITE.erl
@@ -50,8 +50,6 @@ all() ->
 %%% The test cases -------------------------------------------------------------
 %%%
 
-process_count(doc) -> [];
-process_count(suite) -> [];
 process_count(Config) when is_list(Config) ->
     case catch erlang:system_info(modified_timing_level) of
 	Level when is_integer(Level) ->
@@ -115,13 +113,9 @@ stop_procs(PMs) ->
 		  end, PMs).
 
 
-system_version(doc) -> [];
-system_version(suite) -> [];
 system_version(Config) when is_list(Config) ->
     ?line {comment, erlang:system_info(system_version)}.
 
-misc_smoke_tests(doc) -> [];
-misc_smoke_tests(suite) -> [];
 misc_smoke_tests(Config) when is_list(Config) ->
     ?line true = is_binary(erlang:system_info(info)),
     ?line true = is_binary(erlang:system_info(procs)),
@@ -132,8 +126,6 @@ misc_smoke_tests(Config) when is_list(Config) ->
     ?line ok.
     
 
-heap_size(doc) -> [];
-heap_size(suite) -> [];
 heap_size(Config) when is_list(Config) ->
    ?line {min_bin_vheap_size, VHmin} = erlang:system_info(min_bin_vheap_size),
    ?line {min_heap_size, Hmin} =  erlang:system_info(min_heap_size),
@@ -142,10 +134,7 @@ heap_size(Config) when is_list(Config) ->
    ?line Hmin  = proplists:get_value(min_heap_size, GCinf),
    ok.
 
-wordsize(suite) ->
-    [];
-wordsize(doc) ->
-    ["Tests the various wordsize variants"];
+%% Tests the various wordsize variants
 wordsize(Config) when is_list(Config) ->
     ?line A = erlang:system_info(wordsize),
     ?line true = is_integer(A),
@@ -161,7 +150,7 @@ wordsize(Config) when is_list(Config) ->
 	    exit({unexpected_wordsizes,Other})
     end.
 
-memory(doc) -> ["Verify that erlang:memory/0 and memory results in crashdump produce are similar"];
+%% Verify that erlang:memory/0 and memory results in crashdump produce are similar
 memory(Config) when is_list(Config) ->
     %%
     %% Verify that erlang:memory/0 and memory results in
@@ -501,9 +490,7 @@ mapn(_Fun, 0) ->
 mapn(Fun, N) ->
     [Fun(N) | mapn(Fun, N-1)].
 
-ets_limit(doc) ->
-    "Verify system_info(ets_limit) reflects max ETS table settings.";
-ets_limit(suite) -> [];
+%% Verify system_info(ets_limit) reflects max ETS table settings.
 ets_limit(Config0) when is_list(Config0) ->
     Config = [{testcase,ets_limit}|Config0],
     true = is_integer(get_ets_limit(Config)),
diff --git a/erts/emulator/test/system_profile_SUITE.erl b/erts/emulator/test/system_profile_SUITE.erl
index 7abce1e715..6d80d436ba 100644
--- a/erts/emulator/test/system_profile_SUITE.erl
+++ b/erts/emulator/test/system_profile_SUITE.erl
@@ -45,10 +45,6 @@ all() ->
 %% No specification clause needed for an init function in a conf case!!!
 
 %% Test switching system_profiling on and off.
-system_profile_on_and_off(suite) ->
-    [];
-system_profile_on_and_off(doc) ->
-    ["Tests switching system_profiling on and off."];
 system_profile_on_and_off(Config) when is_list(Config) ->
     Pid = start_profiler_process(),
     
@@ -77,12 +73,7 @@ system_profile_on_and_off(Config) when is_list(Config) ->
     exit(Pid,kill),
     ok.
 
-%% Test runnable_procs
-
-runnable_procs(suite) ->
-    [];
-runnable_procs(doc) ->
-    ["Tests system_profiling with runnable_procs."];
+%% Tests system_profiling with runnable_procs.
 runnable_procs(Config) when is_list(Config) ->
     lists:foreach(fun (TsType) ->
 			  Arg = case TsType of
@@ -119,10 +110,7 @@ do_runnable_procs({TsType, TsTypeFlag}) ->
     exit(Pid,kill),
     ok.
 
-runnable_ports(suite) ->
-    [];
-runnable_ports(doc) ->
-    ["Tests system_profiling with runnable_port."];
+%% Tests system_profiling with runnable_port.
 runnable_ports(Config) when is_list(Config) ->
     lists:foreach(fun (TsType) ->
 			  Arg = case TsType of
@@ -155,10 +143,7 @@ do_runnable_ports({TsType, TsTypeFlag}, Config) ->
     exit(Pid,kill),
     ok.
 
-scheduler(suite) ->
-    [];
-scheduler(doc) ->
-    ["Tests system_profiling with scheduler."];
+%% Tests system_profiling with scheduler.
 scheduler(Config) when is_list(Config) ->
     case {erlang:system_info(smp_support), erlang:system_info(schedulers_online)} of
 	{false,_} -> {skipped, "No need for scheduler test when smp support is disabled."};
@@ -180,11 +165,7 @@ scheduler(Config) when is_list(Config) ->
 			   strict_monotonic_timestamp])
     end.
 
-% the profiler pid should not be profiled
-dont_profile_profiler(suite) ->
-    [];
-dont_profile_profiler(doc) ->
-    ["Ensure system profiler process is not profiled."];
+%% Ensure system profiler process is not profiled.
 dont_profile_profiler(Config) when is_list(Config) ->
     Pid = start_profiler_process(),
 
diff --git a/erts/emulator/test/time_SUITE.erl b/erts/emulator/test/time_SUITE.erl
index cdf79e48d0..aeddb0d216 100644
--- a/erts/emulator/test/time_SUITE.erl
+++ b/erts/emulator/test/time_SUITE.erl
@@ -103,10 +103,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-local_to_univ_utc(suite) ->
-    [];
-local_to_univ_utc(doc) ->
-    ["Test that DST = true on timezones without DST is ignored"];
+%% Test that DST = true on timezones without DST is ignored
 local_to_univ_utc(Config) when is_list(Config) ->
     case os:type() of
 	{unix,_} ->
@@ -315,10 +312,7 @@ effective_timezone1(_) ->
 %% Test (the bif) os:timestamp/0, which is something quite like, but not
 %% similar to erlang:now...
 
-timestamp(suite) ->
-    [];
-timestamp(doc) ->
-    ["Test that os:timestamp works."];
+%% Test that os:timestamp works.
 timestamp(Config) when is_list(Config) ->
     try
 	repeating_timestamp_check(100000)
diff --git a/erts/emulator/test/timer_bif_SUITE.erl b/erts/emulator/test/timer_bif_SUITE.erl
index c04c2e465e..30621e62dc 100644
--- a/erts/emulator/test/timer_bif_SUITE.erl
+++ b/erts/emulator/test/timer_bif_SUITE.erl
@@ -71,7 +71,7 @@ all() ->
      auto_cancel_yielding].
 
 
-start_timer_1(doc) -> ["Basic start_timer/3 functionality"];
+%% Basic start_timer/3 functionality
 start_timer_1(Config) when is_list(Config) ->
     Ref1 = erlang:start_timer(1000, self(), plopp),
     ok   = get(1100, {timeout, Ref1, plopp}),
@@ -91,14 +91,14 @@ start_timer_1(Config) when is_list(Config) ->
     no_message = get(900, {timeout, Ref3, plopp}),
     ok.
 
-send_after_1(doc) -> ["Basic send_after/3 functionality"];
+%% Basic send_after/3 functionality
 send_after_1(Config) when is_list(Config) ->
     ?line Ref3 = erlang:send_after(1000, self(), plipp),
     ?line ok = get(1500, plipp),
     ?line false = erlang:read_timer(Ref3),
     ok.
 
-start_timer_big(doc) -> ["Big timeouts for start_timer/3"];
+%% Big timeouts for start_timer/3
 start_timer_big(Config) when is_list(Config) ->
     ?line Big = 1 bsl 31,
     ?line R = erlang:start_timer(Big, self(), hej),
@@ -112,7 +112,7 @@ start_timer_big(Config) when is_list(Config) ->
 	  end,
     ok.
 
-send_after_big(doc) -> ["Big timeouts for send_after/3"];
+%% Big timeouts for send_after/3
 send_after_big(Config) when is_list(Config) ->
     ?line Big = 1 bsl 31,
     ?line R = erlang:send_after(Big, self(), hej),
@@ -126,7 +126,7 @@ send_after_big(Config) when is_list(Config) ->
 	  end,
     ok.
 
-send_after_2(doc) -> ["send_after/3: messages in the right order, kind version"];
+%% send_after/3: messages in the right order, kind version
 send_after_2(Config) when is_list(Config) ->
     ?line _ = erlang:send_after(5000, self(), last),
     ?line _ = erlang:send_after(0, self(), a0),
@@ -138,7 +138,7 @@ send_after_2(Config) when is_list(Config) ->
     ?line [a0,a1,a2,a3,a4,a5,last] = collect(last),
     ok.
 
-send_after_3(doc) -> ["send_after/3: messages in the right order, worse than send_after_2"];
+%% send_after/3: messages in the right order, worse than send_after_2
 send_after_3(Config) when is_list(Config) ->
     _ = erlang:send_after(100, self(), b1),
     _ = erlang:send_after(101, self(), b2),
@@ -155,13 +155,13 @@ send_after_3(Config) when is_list(Config) ->
 
     ok.
 
-cancel_timer_1(doc) -> ["Check trivial cancel_timer/1 behaviour"];
+%% Check trivial cancel_timer/1 behaviour
 cancel_timer_1(Config) when is_list(Config) ->
     ?line false = erlang:cancel_timer(make_ref()),
 
     ok.
 
-start_timer_e(doc) -> ["Error cases for start_timer/3"];
+%% Error cases for start_timer/3
 start_timer_e(Config) when is_list(Config) ->
     ?line {'EXIT', _} = (catch erlang:start_timer(-4, self(), hej)),
     ?line {'EXIT', _} = (catch erlang:start_timer(1 bsl 64,
@@ -178,8 +178,7 @@ start_timer_e(Config) when is_list(Config) ->
 
     ok.
 
-send_after_e(doc) -> ["Error cases for send_after/3"];
-send_after_e(suite) -> [];
+%% Error cases for send_after/3
 send_after_e(Config) when is_list(Config) ->
     ?line {'EXIT', _} = (catch erlang:send_after(-4, self(), hej)),
     ?line {'EXIT', _} = (catch erlang:send_after(1 bsl 64,
@@ -194,16 +193,14 @@ send_after_e(Config) when is_list(Config) ->
     ?line stop_slave(Node),
     ok.
 
-cancel_timer_e(doc) -> ["Error cases for cancel_timer/1"];
-cancel_timer_e(suite) -> [];
+%% Error cases for cancel_timer/1
 cancel_timer_e(Config) when is_list(Config) ->
     ?line {'EXIT', _} = (catch erlang:cancel_timer(1)),
     ?line {'EXIT', _} = (catch erlang:cancel_timer(self())),
     ?line {'EXIT', _} = (catch erlang:cancel_timer(a)),
     ok.
 
-read_timer_trivial(doc) -> ["Trivial and error test cases for read_timer/1."];
-read_timer_trivial(suite) -> [];
+%% Trivial and error test cases for read_timer/1.
 read_timer_trivial(Config) when is_list(Config) ->
     ?line false = erlang:read_timer(make_ref()),
     ?line {'EXIT', _} = (catch erlang:read_timer(42)),
@@ -212,8 +209,7 @@ read_timer_trivial(Config) when is_list(Config) ->
     ?line {'EXIT', _} = (catch erlang:read_timer(ab)),
     ok.
 
-read_timer(doc) -> ["Test that read_timer/1 seems to return the correct values."];
-read_timer(suite) -> [];
+%% Test that read_timer/1 seems to return the correct values.
 read_timer(Config) when is_list(Config) ->
     process_flag(scheduler, 1),
     Big = 1 bsl 31,
@@ -237,8 +233,7 @@ read_timer(Config) when is_list(Config) ->
     process_flag(scheduler, 0),
     ok.
 
-read_timer_async(doc) -> ["Test that read_timer/1 seems to return the correct values."];
-read_timer_async(suite) -> [];
+%% Test that read_timer/1 seems to return the correct values.
 read_timer_async(Config) when is_list(Config) ->
     process_flag(scheduler, 1),
     Big = 1 bsl 33,
@@ -269,8 +264,6 @@ read_timer_async(Config) when is_list(Config) ->
     process_flag(scheduler, 0),
     ok.
 
-cleanup(doc) -> [];
-cleanup(suite) -> [];
 cleanup(Config) when is_list(Config) ->
     ?line Mem = mem(),
     %% Timer on dead process
@@ -320,8 +313,6 @@ cleanup(Config) when is_list(Config) ->
     ?line ok.
 
 
-evil_timers(doc) -> [];
-evil_timers(suite) -> [];
 evil_timers(Config) when is_list(Config) ->
     %% Create a composite term consisting of at least:
     %% * externals (remote pids, ports, and refs)
@@ -458,8 +449,6 @@ evil_recv_timeouts(TOs, N, M) ->
 		  ?line evil_recv_timeouts(TOs, N, M)
 	  end.
 
-registered_process(doc) -> [];
-registered_process(suite) -> [];
 registered_process(Config) when is_list(Config) ->
     ?line Mem = mem(),
     %% Cancel
diff --git a/erts/emulator/test/trace_SUITE.erl b/erts/emulator/test/trace_SUITE.erl
index 44d631cfa9..6f3415fa7b 100644
--- a/erts/emulator/test/trace_SUITE.erl
+++ b/erts/emulator/test/trace_SUITE.erl
@@ -104,8 +104,8 @@ receive_trace(Config) when is_list(Config) ->
     ?line receive_nothing(),
     ok.
 
-self_send(doc) -> ["Test that traces are generated for messages sent ",
-		    "and received to/from self()."];
+%% Test that traces are generated for messages sent
+%% and received to/from self().
 self_send(Config) when is_list(Config) ->
     ?line Fun =
 	fun(Self, Parent) -> receive
@@ -392,8 +392,7 @@ set_on_first_spawn(Config) when is_list(Config) ->
     ok.
 
 
-system_monitor_args(doc) ->
-    ["Tests arguments to erlang:system_monitor/0-2)"];
+%% Tests arguments to erlang:system_monitor/0,1,2
 system_monitor_args(Config) when is_list(Config) ->
     ?line Self = self(),
     %%
@@ -455,8 +454,7 @@ system_monitor_args(Config) when is_list(Config) ->
     ok.
 
 
-more_system_monitor_args(doc) ->
-    ["Tests arguments to erlang:system_monitor/0-2)"];
+%% Tests arguments to erlang:system_monitor/0,1,2
 more_system_monitor_args(Config) when is_list(Config) ->
     ?line try_l(64000),
     ?line try_l(16#7ffffff),
@@ -502,10 +500,7 @@ start_monitor() ->
     erlang:yield(), % Need to be rescheduled for the trace to take
     ok.
 
-system_monitor_long_schedule(suite) ->
-    [];
-system_monitor_long_schedule(doc) ->
-    ["Tests erlang:system_monitor(Pid, [{long_schedule,Time}])"];
+%% Tests erlang:system_monitor(Pid, [{long_schedule,Time}])
 system_monitor_long_schedule(Config) when is_list(Config) ->
     Path = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
@@ -541,10 +536,7 @@ do_system_monitor_long_schedule() ->
 
 -define(LONG_GC_SLEEP, 670).
 
-system_monitor_long_gc_1(suite) ->
-    [];
-system_monitor_long_gc_1(doc) ->
-    ["Tests erlang:system_monitor(Pid, [{long_gc,Time}])"];
+%% Tests erlang:system_monitor(Pid, [{long_gc,Time}])
 system_monitor_long_gc_1(Config) when is_list(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
     try 
@@ -566,10 +558,7 @@ system_monitor_long_gc_1(Config) when is_list(Config) ->
 	erts_debug:set_internal_state(available_internal_state, false)	
     end.
 
-system_monitor_long_gc_2(suite) ->
-    [];
-system_monitor_long_gc_2(doc) ->
-    ["Tests erlang:system_monitor(Pid, [{long_gc,Time}])"];
+%% Tests erlang:system_monitor(Pid, [{long_gc,Time}])
 system_monitor_long_gc_2(Config) when is_list(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
     try
@@ -659,10 +648,7 @@ long_gc_check(Pid, Time, Result) ->
 	    Result
     end.
 
-system_monitor_large_heap_1(suite) ->
-    [];
-system_monitor_large_heap_1(doc) ->
-    ["Tests erlang:system_monitor(Pid, [{large_heap,Size}])"];
+%% Tests erlang:system_monitor(Pid, [{large_heap,Size}])
 system_monitor_large_heap_1(Config) when is_list(Config) ->
     ?line LoadFun =
 	fun (Size) -> 
@@ -673,10 +659,7 @@ system_monitor_large_heap_1(Config) when is_list(Config) ->
 	end,
     ?line large_heap(LoadFun, false).
 
-system_monitor_large_heap_2(suite) ->
-    [];
-system_monitor_large_heap_2(doc) ->
-    ["Tests erlang:system_monitor(Pid, [{large_heap,Size}])"];
+%% Tests erlang:system_monitor(Pid, [{large_heap,Size}])
 system_monitor_large_heap_2(Config) when is_list(Config) ->
     ?line Parent = self(),
     ?line LoadFun =
@@ -787,7 +770,7 @@ spawn_children(Parent, Number, Result) ->
 	    spawn_children(Parent, Number-1, [Child|Result])
     end.
 
-suspend(doc) -> "Test erlang:suspend/1 and erlang:resume/1.";
+%% Test erlang:suspend/1 and erlang:resume/1.
 suspend(Config) when is_list(Config) ->
     ct:timetrap({minutes,2}),
     ?line Worker = fun_spawn(fun worker/0),
@@ -815,10 +798,6 @@ do_suspend(Pid, N) ->
 
 
 
-mutual_suspend(doc) ->
-    [];
-mutual_suspend(suite) ->
-    [];
 mutual_suspend(Config) when is_list(Config) ->
     ?line TimeoutSecs = 5*60,
     ct:timetrap({seconds, TimeoutSecs}),
@@ -866,10 +845,6 @@ do_mutual_suspend(Pid, N) ->
     ?line true = erlang:resume_process(Pid),
     ?line do_mutual_suspend(Pid, N-1).		
 
-suspend_exit(doc) ->
-    [];
-suspend_exit(suite) ->
-    [];
 suspend_exit(Config) when is_list(Config) ->
     ct:timetrap({minutes, 2}),
     rand:seed(exsplus, {4711,17,4711}),
@@ -923,10 +898,6 @@ suspend_exit_work(N) ->
 chk_suspended(P, Bool, Line) ->
     {Bool, Line} = {({status, suspended} == process_info(P, status)), Line}.
 
-suspender_exit(doc) ->
-    [];
-suspender_exit(suite) ->
-    [];
 suspender_exit(Config) when is_list(Config) ->
     ct:timetrap({minutes, 3}),
     ?line P1 = spawn_link(fun () -> receive after infinity -> ok end end),
@@ -1033,10 +1004,6 @@ suspender_exit(Config) when is_list(Config) ->
     ?line exit(P1, bong),
     ?line ok.
 			 
-suspend_system_limit(doc) ->			 
-    [];
-suspend_system_limit(suite) ->
-    [];
 suspend_system_limit(Config) when is_list(Config) ->
     case os:getenv("ERL_EXTREME_TESTING") of
 	"true" ->
@@ -1094,10 +1061,6 @@ resume_from_system_limit(P, N, M) ->
 		    synced = 0,
 		    async_once = 0}).
 
-suspend_opts(doc) ->
-    [];
-suspend_opts(suite) ->
-    [];
 suspend_opts(Config) when is_list(Config) ->
     ct:timetrap({minutes, 3}),
     ?line Self = self(),
@@ -1245,7 +1208,7 @@ repeat_acc(Fun, N, M, Acc) ->
 %% Tests that waiting process can be suspended
 %% (bug in R2D and earlier; see OTP-1488).
 
-suspend_waiting(doc) -> "Test that a waiting process can be suspended.";
+%% Test that a waiting process can be suspended.
 suspend_waiting(Config) when is_list(Config) ->
     ?line Process = fun_spawn(fun process/0),
     ?line receive after 1 -> ok end,
@@ -1254,8 +1217,7 @@ suspend_waiting(Config) when is_list(Config) ->
     ok.
 
 
-new_clear(doc) ->
-    "Test that erlang:trace(new, true, ...) is cleared when tracer dies.";
+%% Test that erlang:trace(new, true, ...) is cleared when tracer dies.
 new_clear(Config) when is_list(Config) ->
     ?line Tracer = spawn(fun receiver/0),
     ?line 0 = erlang:trace(new, true, [send, {tracer, Tracer}]),
@@ -1272,8 +1234,7 @@ new_clear(Config) when is_list(Config) ->
 
 
 
-existing_clear(doc) ->
-    "Test that erlang:trace(all, false, ...) works without tracer.";
+%% Test that erlang:trace(all, false, ...) works without tracer.
 existing_clear(Config) when is_list(Config) ->
     ?line Self = self(),
 
@@ -1289,8 +1250,7 @@ existing_clear(Config) when is_list(Config) ->
     ?line M = N + 1, % Since trace could not be enabled on the tracer.
     ok.
 
-bad_flag(doc) -> "Test that an invalid flag cause badarg";
-bad_flag(suite) -> [];
+%% Test that an invalid flag cause badarg
 bad_flag(Config) when is_list(Config) ->
     %% A bad flag could deadlock the SMP emulator in erts-5.5
     ?line {'EXIT', {badarg, _}} = (catch erlang:trace(new,
@@ -1298,8 +1258,7 @@ bad_flag(Config) when is_list(Config) ->
 						      [not_a_valid_flag])),
     ?line ok.
 
-trace_delivered(doc) -> "Test erlang:trace_delivered/1";
-trace_delivered(suite) -> [];
+%% Test erlang:trace_delivered/1
 trace_delivered(Config) when is_list(Config) ->
     ct:timetrap({minutes, 1}),
     ?line TokLoops = 10000,
diff --git a/erts/emulator/test/trace_bif_SUITE.erl b/erts/emulator/test/trace_bif_SUITE.erl
index e3e4e2e6d8..7995c1831a 100644
--- a/erts/emulator/test/trace_bif_SUITE.erl
+++ b/erts/emulator/test/trace_bif_SUITE.erl
@@ -61,8 +61,7 @@ end_per_group(_GroupName, Config) ->
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
-trace_on_and_off(doc) -> 
-    "Tests switching tracing on and off.";
+%% Tests switching tracing on and off.
 trace_on_and_off(Config) when is_list(Config) ->
     ?line Pid = spawn(?MODULE, bif_process, []),
     ?line Self = self(),
@@ -79,11 +78,11 @@ trace_on_and_off(Config) when is_list(Config) ->
     ?line exit(Pid,kill),
     ok.
 
-trace_bif(doc) -> "Test tracing BIFs.";
+%% Test tracing BIFs.
 trace_bif(Config) when is_list(Config) ->
     do_trace_bif([]).
 
-trace_bif_local(doc) -> "Test tracing BIFs with local flag.";
+%% Test tracing BIFs with local flag.
 trace_bif_local(Config) when is_list(Config) ->
     do_trace_bif([local]).
 
@@ -110,7 +109,7 @@ do_trace_bif(Flags) ->
     ?line exit(Pid, die),
     ok.
 
-trace_bif_timestamp(doc) -> "Test tracing BIFs with timestamps.";
+%% Test tracing BIFs with timestamps.
 trace_bif_timestamp(Config) when is_list(Config) ->
     do_trace_bif_timestamp([], timestamp, [timestamp]),
     do_trace_bif_timestamp([], timestamp,
@@ -123,8 +122,7 @@ trace_bif_timestamp(Config) when is_list(Config) ->
 			   [monotonic_timestamp, strict_monotonic_timestamp]),
     do_trace_bif_timestamp([], monotonic_timestamp, [monotonic_timestamp]).
     
-trace_bif_timestamp_local(doc) -> 
-    "Test tracing BIFs with timestamps and local flag.";
+%% Test tracing BIFs with timestamps and local flag.
 trace_bif_timestamp_local(Config) when is_list(Config) ->
     do_trace_bif_timestamp([local], timestamp, [timestamp]),
     do_trace_bif_timestamp([local], timestamp,
@@ -182,8 +180,7 @@ do_trace_bif_timestamp(Flags, TsType, TsFlags) ->
     exit(Pid, die),
     ok.
 
-trace_bif_return(doc) -> 
-    "Test tracing BIF's with return/return_to trace.";
+%% Test tracing BIF's with return/return_to trace.
 trace_bif_return(Config) when is_list(Config) ->
     do_trace_bif_return(timestamp, [timestamp]),
     do_trace_bif_return(timestamp,
@@ -347,7 +344,7 @@ bif_process() ->
     
 
 
-trace_info_old_code(doc) -> "trace_info on deleted module (OTP-5057).";
+%% trace_info on deleted module (OTP-5057).
 trace_info_old_code(Config) when is_list(Config) ->
     ?line MFA = {M,F,0} = {test,foo,0},
     ?line Fname = atom_to_list(M)++".erl",
diff --git a/erts/emulator/test/trace_call_count_SUITE.erl b/erts/emulator/test/trace_call_count_SUITE.erl
index 251836831e..3e7c1020a5 100644
--- a/erts/emulator/test/trace_call_count_SUITE.erl
+++ b/erts/emulator/test/trace_call_count_SUITE.erl
@@ -108,38 +108,23 @@ end_per_group(_GroupName, Config) ->
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
-basic(suite) ->
-    [];
-basic(doc) ->
-    ["Tests basic call count trace"];
+%% Tests basic call count trace
 basic(Config) when is_list(Config) ->
     basic_test().
 
-on_and_off(suite) ->
-    [];
-on_and_off(doc) ->
-    ["Tests turning trace parameters on and off"];
+%% Tests turning trace parameters on and off
 on_and_off(Config) when is_list(Config) ->
     on_and_off_test().
  
-info(suite) ->
-    [];
-info(doc) ->
-    ["Tests the trace_info BIF"];
+%% Tests the trace_info BIF
 info(Config) when is_list(Config) ->
     info_test().
  
-pause_and_restart(suite) ->
-    [];
-pause_and_restart(doc) ->
-    ["Tests pausing and restarting call counters"];
+%% Tests pausing and restarting call counters
 pause_and_restart(Config) when is_list(Config) ->
     pause_and_restart_test().
  
-combo(suite) ->
-    [];
-combo(doc) ->
-    ["Tests combining local call trace and meta trace with call count trace"];
+%% Tests combining local call trace and meta trace with call count trace
 combo(Config) when is_list(Config) ->
     combo_test().
 
diff --git a/erts/emulator/test/trace_call_time_SUITE.erl b/erts/emulator/test/trace_call_time_SUITE.erl
index 907026bf03..09eda2845c 100644
--- a/erts/emulator/test/trace_call_time_SUITE.erl
+++ b/erts/emulator/test/trace_call_time_SUITE.erl
@@ -94,10 +94,7 @@ all() ->
 not_run(Config) when is_list(Config) ->
     {skipped,"Native code"}.
 
-basic(suite) ->
-    [];
-basic(doc) ->
-    ["Tests basic call count trace"];
+%% Tests basic call time trace
 basic(Config) when is_list(Config) ->
     ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
     ?line M = 1000,
@@ -123,10 +120,7 @@ basic(Config) when is_list(Config) ->
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-on_and_off(suite) ->
-    [];
-on_and_off(doc) ->
-    ["Tests turning trace parameters on and off"];
+%% "Tests turning trace parameters on and off
 on_and_off(Config) when is_list(Config) ->
     ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
     ?line M = 100,
@@ -164,10 +158,7 @@ on_and_off(Config) when is_list(Config) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-info(suite) ->
-    [];
-info(doc) ->
-    ["Tests the trace_info BIF"];
+%% Tests the trace_info BIF
 info(Config) when is_list(Config) ->
     ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
     %%
@@ -188,10 +179,7 @@ info(Config) when is_list(Config) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-pause_and_restart(suite) ->
-    [];
-pause_and_restart(doc) ->
-    ["Tests pausing and restarting call time counters"];
+%% Tests pausing and restarting call time counters
 pause_and_restart(Config) when is_list(Config) ->
     ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
     ?line M = 100,
@@ -216,10 +204,7 @@ pause_and_restart(Config) when is_list(Config) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-scheduling(suite) ->
-    [];
-scheduling(doc) ->
-    ["Tests in/out scheduling of call time counters"];
+%% Tests in/out scheduling of call time counters
 scheduling(Config) when is_list(Config) ->
     ?line P  = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
     ?line M  = 1000000,
@@ -252,10 +237,7 @@ scheduling(Config) when is_list(Config) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-combo(suite) ->
-    [];
-combo(doc) ->
-    ["Tests combining local call trace and meta trace with call time trace"];
+%% "Tests combining local call trace and meta trace with call time trace
 combo(Config) when is_list(Config) ->
     ?line Self = self(),
     ?line Nbc = 3,
@@ -366,10 +348,7 @@ combo(Config) when is_list(Config) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-bif(suite) ->
-    [];
-bif(doc) ->
-    ["Tests tracing of bifs"];
+%% Tests tracing of bifs
 bif(Config) when is_list(Config) ->
     ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
     ?line M = 1000000,
@@ -398,10 +377,7 @@ bif(Config) when is_list(Config) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-nif(suite) ->
-    [];
-nif(doc) ->
-    ["Tests tracing of nifs"];
+%% Tests tracing of nifs
 nif(Config) when is_list(Config) ->
     load_nif(Config),
     ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
@@ -424,10 +400,7 @@ nif(Config) when is_list(Config) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-called_function(suite) ->
-    [];
-called_function(doc) ->
-    ["Tests combining nested function calls and that the time accumulates to the right function"];
+%% Tests combining nested function calls and that the time accumulates to the right function
 called_function(Config) when is_list(Config) ->
     ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
     ?line M = 2100,
diff --git a/erts/emulator/test/trace_local_SUITE.erl b/erts/emulator/test/trace_local_SUITE.erl
index 93ba9a6ba3..80ffc18d17 100644
--- a/erts/emulator/test/trace_local_SUITE.erl
+++ b/erts/emulator/test/trace_local_SUITE.erl
@@ -101,120 +101,97 @@ all() ->
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
-basic(doc) ->
-    ["Tests basic local call-trace"];
+%% Tests basic local call-trace
 basic(Config) when is_list(Config) ->
     basic_test().
 
-bit_syntax(doc) ->
-    "OTP-7399: Make sure that code that uses the optimized bit syntax matching "
-	"can be traced without crashing the emulator.";
+%% OTP-7399: Make sure that code that uses the optimized bit syntax matching
+%% can be traced without crashing the emulator.
 bit_syntax(Config) when is_list(Config) ->
     bit_syntax_test().
 
-return(doc) ->
-    ["Tests the different types of return trace"];
+%% Tests the different types of return trace
 return(Config) when is_list(Config) ->
     return_test().
  
-on_and_off(doc) ->
-    ["Tests turning trace parameters on and off, "
-     "both for trace and trace_pattern"];
+%% Tests turning trace parameters on and off,
+%% both for trace and trace_pattern
 on_and_off(Config) when is_list(Config) ->
     on_and_off_test().
  
-stack_grow(doc) ->
-    ["Tests the stack growth during return traces"];
+%% Tests the stack growth during return traces
 stack_grow(Config) when is_list(Config) ->
     stack_grow_test().
  
-info(doc) ->
-    ["Tests the trace_info BIF"];
+%% Tests the trace_info BIF
 info(Config) when is_list(Config) ->
     info_test().
  
-delete(doc) ->
-    ["Tests putting trace on deleted modules"];
+%% Tests putting trace on deleted modules
 delete(Config) when is_list(Config) ->
     delete_test(Config).
 
-exception(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception(Config) when is_list(Config) ->
     exception_test([]).
 
-exception_apply(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception_apply(Config) when is_list(Config) ->
     exception_test([apply]).
 
-exception_function(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception_function(Config) when is_list(Config) ->
     exception_test([function]).
 
-exception_apply_function(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception_apply_function(Config) when is_list(Config) ->
     exception_test([apply,function]).
 
-exception_nocatch(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception_nocatch(Config) when is_list(Config) ->
     exception_test([nocatch]).
 
-exception_nocatch_apply(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception_nocatch_apply(Config) when is_list(Config) ->
     exception_test([nocatch,apply]).
 
-exception_nocatch_function(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception_nocatch_function(Config) when is_list(Config) ->
     exception_test([nocatch,function]).
 
-exception_nocatch_apply_function(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception_nocatch_apply_function(Config) when is_list(Config) ->
     exception_test([nocatch,apply,function]).
 
-exception_meta(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta(Config) when is_list(Config) ->
     exception_test([meta]).
 
-exception_meta_apply(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta_apply(Config) when is_list(Config) ->
     exception_test([meta,apply]).
 
-exception_meta_function(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta_function(Config) when is_list(Config) ->
     exception_test([meta,function]).
 
-exception_meta_apply_function(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta_apply_function(Config) when is_list(Config) ->
     exception_test([meta,apply,function]).
 
-exception_meta_nocatch(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta_nocatch(Config) when is_list(Config) ->
     exception_test([meta,nocatch]).
 
-exception_meta_nocatch_apply(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta_nocatch_apply(Config) when is_list(Config) ->
     exception_test([meta,nocatch,apply]).
 
-exception_meta_nocatch_function(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta_nocatch_function(Config) when is_list(Config) ->
     exception_test([meta,nocatch,function]).
 
-exception_meta_nocatch_apply_function(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta_nocatch_apply_function(Config) when is_list(Config) ->
     exception_test([meta,nocatch,apply,function]).
 
diff --git a/erts/emulator/test/trace_meta_SUITE.erl b/erts/emulator/test/trace_meta_SUITE.erl
index a2db701d36..dcc2cc807b 100644
--- a/erts/emulator/test/trace_meta_SUITE.erl
+++ b/erts/emulator/test/trace_meta_SUITE.erl
@@ -94,55 +94,35 @@ end.
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
-basic(suite) ->
-    [];
-basic(doc) ->
-    ["Tests basic meta trace"];
+%% Tests basic meta trace
 basic(Config) when is_list(Config) ->
     basic_test().
 
-return(suite) ->
-    [];
-return(doc) ->
-    ["Tests return trace"];
+%% Tests return trace
 return(Config) when is_list(Config) ->
     return_test().
  
-on_and_off(suite) ->
-    [];
-on_and_off(doc) ->
-    ["Tests turning trace parameters on and off"];
+%% Tests turning trace parameters on and off
 on_and_off(Config) when is_list(Config) ->
     on_and_off_test().
  
-stack_grow(doc) ->
-    ["Tests the stack growth during return traces"];
+%% Tests the stack growth during return traces
 stack_grow(Config) when is_list(Config) ->
     stack_grow_test().
  
-info(doc) ->
-    ["Tests the trace_info BIF"];
+%% Tests the trace_info BIF
 info(Config) when is_list(Config) ->
     info_test().
  
-tracer(suite) ->
-    [];
-tracer(doc) ->
-    ["Tests stopping and changing tracer process"];
+%% Tests stopping and changing tracer process
 tracer(Config) when is_list(Config) ->
     tracer_test().
 
-combo(suite) ->
-    [];
-combo(doc) ->
-    ["Tests combining local call trace with meta trace"];
+%% Tests combining local call trace with meta trace
 combo(Config) when is_list(Config) ->
     combo_test().
 
-nosilent(suite) ->
-    [];
-nosilent(doc) ->
-    ["Tests that meta trace is not silenced by the silent process flag"];
+%% Tests that meta trace is not silenced by the silent process flag
 nosilent(Config) when is_list(Config) ->
     nosilent_test().
 
diff --git a/erts/emulator/test/trace_nif_SUITE.erl b/erts/emulator/test/trace_nif_SUITE.erl
index 4ddcbf8f6b..4cf9069f1d 100644
--- a/erts/emulator/test/trace_nif_SUITE.erl
+++ b/erts/emulator/test/trace_nif_SUITE.erl
@@ -64,18 +64,18 @@ end_per_group(_GroupName, Config) ->
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
-trace_nif(doc) -> "Test tracing NIFs.";
+%% Test tracing NIFs.
 trace_nif(Config) when is_list(Config) ->
     load_nif(Config),
     
     do_trace_nif([]).
 
-trace_nif_local(doc) -> "Test tracing NIFs with local flag.";
+%% Test tracing NIFs with local flag.
 trace_nif_local(Config) when is_list(Config) ->
     load_nif(Config),
     do_trace_nif([local]).
 
-trace_nif_meta(doc) -> "Test tracing NIFs with meta flag.";
+%% Test tracing NIFs with meta flag.
 trace_nif_meta(Config) when is_list(Config) ->
     load_nif(Config),
     ?line Pid=spawn_link(?MODULE, nif_process, []),
@@ -143,13 +143,12 @@ do_trace_nif(Flags) ->
     ?line exit(Pid, die),
     ok.
 
-trace_nif_timestamp(doc) -> "Test tracing NIFs with timestamps.";
+%% Test tracing NIFs with timestamps.
 trace_nif_timestamp(Config) when is_list(Config) ->
     load_nif(Config),
     do_trace_nif_timestamp([]).
 
-trace_nif_timestamp_local(doc) -> 
-    "Test tracing NIFs with timestamps and local flag.";
+%% Test tracing NIFs with timestamps and local flag.
 trace_nif_timestamp_local(Config) when is_list(Config) ->
     load_nif(Config),
     do_trace_nif_timestamp([local]).
@@ -191,8 +190,7 @@ do_trace_nif_timestamp(Flags) ->
     ?line exit(Pid, die),
     ok.
 
-trace_nif_return(doc) -> 
-    "Test tracing NIF's with return/return_to trace.";
+%% Test tracing NIF's with return/return_to trace.
 trace_nif_return(Config) when is_list(Config) ->
     load_nif(Config),
 
diff --git a/erts/emulator/test/trace_port_SUITE.erl b/erts/emulator/test/trace_port_SUITE.erl
index a38fced7cb..73b32fdf7d 100644
--- a/erts/emulator/test/trace_port_SUITE.erl
+++ b/erts/emulator/test/trace_port_SUITE.erl
@@ -50,7 +50,7 @@ all() ->
      fake_schedule_after_getting_unlinked, gc,
      default_tracer, tracer_port_crash].
 
-call_trace(doc) -> "Test sending call trace messages to a port.";
+%% Test sending call trace messages to a port.
 call_trace(Config) when is_list(Config) ->
     case test_server:is_native(?MODULE) orelse
 	test_server:is_native(lists) of
@@ -102,7 +102,7 @@ bs_sum_c(<<H:4,T/bits>>, Acc) -> bs_sum_c(T, H+Acc);
 bs_sum_c(<<>>, Acc) -> Acc.
 
 
-return_trace(doc) -> "Test the new return trace.";
+%% Test the new return trace.
 return_trace(Config) when is_list(Config) ->
     case test_server:is_native(?MODULE) orelse
 	test_server:is_native(lists) of
@@ -137,7 +137,7 @@ return_trace(Config) when is_list(Config) ->
 	    ok
     end.
 
-send(doc) -> "Test sending send trace messages to a port.";
+%% Test sending send trace messages to a port.
 send(Config) when is_list(Config) ->
     ?line Tracer = start_tracer(Config),
     Self = self(),
@@ -176,7 +176,7 @@ send(Config) when is_list(Config) ->
     receive good_bye -> ok end,
     ok.
 
-receive_trace(doc) -> "Test sending receive traces to a port.";
+%% Test sending receive traces to a port.
 receive_trace(Config) when is_list(Config) ->
     ?line start_tracer(Config),
     ?line Receiver = fun_spawn(fun receiver/0),
@@ -191,7 +191,7 @@ receive_trace(Config) when is_list(Config) ->
     ?line expect({trace_ts,Receiver,'receive',Huge,ts}),
     ok.
 
-process_events(doc) -> "Tests a few process events (like getting linked).";
+%% Tests a few process events (like getting linked).
 process_events(Config) when is_list(Config) ->
     ?line start_tracer(Config),
     Self = self(),
@@ -216,7 +216,7 @@ process_events(Config) when is_list(Config) ->
 
     ok.
 
-schedule(doc) -> "Test sending scheduling events to a port.";
+%% Test sending scheduling events to a port.
 schedule(Config) when is_list(Config) ->
     ?line start_tracer(Config),
     ?line Receiver = fun_spawn(fun receiver/0),
@@ -244,7 +244,7 @@ run_fake_sched_test(Fun, Config) when is_function(Fun), is_list(Config) ->
 		  ?line Fun(Config)
 	  end.
 
-fake_schedule(doc) -> "Tests time compensating fake out/in scheduling.";
+%% Tests time compensating fake out/in scheduling.
 fake_schedule(Config) when is_list(Config) ->
     ?line run_fake_sched_test(fun fake_schedule_test/1, Config).
 
@@ -306,8 +306,7 @@ fake_schedule_test(Config) when is_list(Config) ->
     %%
     ok.
 
-fake_schedule_after_register(doc) -> 
-    "Tests fake out/in scheduling contents.";
+%% Tests fake out/in scheduling contents.
 fake_schedule_after_register(Config) when is_list(Config) ->
     ?line run_fake_sched_test(fun fake_schedule_after_register_test/1, Config).
 
@@ -334,8 +333,7 @@ fake_schedule_after_register_test(Config) when is_list(Config) ->
     %%
     ok.
 
-fake_schedule_after_getting_linked(doc) -> 
-    "Tests fake out/in scheduling contents.";
+%% Tests fake out/in scheduling contents.
 fake_schedule_after_getting_linked(Config) when is_list(Config) ->
     ?line run_fake_sched_test(fun fake_schedule_after_getting_linked_test/1,
 			      Config).
@@ -363,8 +361,7 @@ fake_schedule_after_getting_linked_test(Config) when is_list(Config) ->
     %%
     ok.
 
-fake_schedule_after_getting_unlinked(doc) -> 
-    "Tests fake out/in scheduling contents.";
+%% Tests fake out/in scheduling contents.
 fake_schedule_after_getting_unlinked(Config) when is_list(Config) ->
     ?line run_fake_sched_test(fun fake_schedule_after_getting_unlinked_test/1,
 			      Config).
@@ -393,7 +390,7 @@ fake_schedule_after_getting_unlinked_test(Config) when is_list(Config) ->
     %%
     ok.
 
-gc(doc) -> "Test sending garbage collection events to a port.";
+%% Test sending garbage collection events to a port.
 gc(Config) when is_list(Config) ->
     ?line start_tracer(Config),
     ?line Garber = fun_spawn(fun garber/0, [{min_heap_size, 5000}]),
@@ -412,8 +409,7 @@ gc(Config) when is_list(Config) ->
 
     ok.
 
-default_tracer(doc) ->
-    "Test a port as default tracer.";
+%% Test a port as default tracer.
 default_tracer(Config) when is_list(Config) ->
     ?line Tracer = start_tracer(Config),
     ?line TracerMonitor = erlang:monitor(process, Tracer),
diff --git a/erts/emulator/test/z_SUITE.erl b/erts/emulator/test/z_SUITE.erl
index ea04790860..755fa5ea99 100644
--- a/erts/emulator/test/z_SUITE.erl
+++ b/erts/emulator/test/z_SUITE.erl
@@ -50,8 +50,7 @@ all() ->
 %%% The test cases -------------------------------------------------------------
 %%%
 
-schedulers_alive(doc) -> ["Tests that all schedulers are actually used"];
-schedulers_alive(suite) -> [];
+%% Tests that all schedulers are actually used
 schedulers_alive(Config) when is_list(Config) ->
     ?line Master = self(),
     ?line NoSchedulersOnline = erlang:system_flag(
@@ -189,23 +188,13 @@ verify_all_schedulers_used({UsedSIDs, UsedSIDsLen} = State, NoSchedulers) ->
 		  ?line verify_all_schedulers_used(NewState, NoSchedulers)
 	  end.
 
-node_container_refc_check(doc) -> [];
-node_container_refc_check(suite) -> [];
 node_container_refc_check(Config) when is_list(Config) ->
     ?line node_container_SUITE:node_container_refc_check(node()),
     ?line ok.
 
-long_timers(doc) ->
-    [];
-long_timers(suite) ->
-    [];
 long_timers(Config) when is_list(Config) ->
     ?line ok = long_timers_test:check_result().
 
-pollset_size(doc) ->
-    [];
-pollset_size(suite) ->
-    [];
 pollset_size(Config) when is_list(Config) ->
     ?line Name = pollset_size_testcase_initial_state_holder,
     ?line Mon = erlang:monitor(process, Name),
@@ -251,10 +240,6 @@ pollset_size(Config) when is_list(Config) ->
 			 ++ integer_to_list(FinSize)}
 	  end.
 
-check_io_debug(doc) ->
-    [];
-check_io_debug(suite) ->
-    [];
 check_io_debug(Config) when is_list(Config) ->
     ?line case lists:keysearch(name, 1, erlang:system_info(check_io)) of
 	      {value, {name, erts_poll}} -> ?line check_io_debug_test();