Eliminate use of doc and suite clauses

Those clause are obsolete and never used by common_test.

37 files changed, 558 insertions, 1717 deletions

diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index 53e00da4db..9f368eb07b 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -114,10 +114,8 @@ loop_until_true(Fun) ->
 %% Should be started in a CC view with:
 %% erl -sname XXX -rsh ctrsh where XX not in [cp1, cp2, cp3]
 %%-----------------------------------------------------------------
-failover(suite) -> [];
-failover(doc) ->
-    ["Tests failover and takeover for distributed applications.  Tests",
-     "start, load etc implicitly."];
+%% Tests failover and takeover for distributed applications.  Tests
+%% start, load etc implicitly.
 failover(Conf) when is_list(Conf) ->
     %% start a help process to check the start type
     StPid = spawn_link(?MODULE, start_type, []),
@@ -219,11 +217,9 @@ failover(Conf) when is_list(Conf) ->
 %% Should be started in a CC view with:
 %% erl -sname XXX -rsh ctrsh where XX not in [cp1, cp2, cp3]
 %%-----------------------------------------------------------------
-failover_comp(suite) -> [];
-failover_comp(doc) ->
-    ["Tests failover and takeover for distributed applications.  Tests",
-     "start, load etc implicitly. The applications do not use start_phases,"
-     "i.e the failover should be trasfered to normal start type."];
+%% Tests failover and takeover for distributed applications.  Tests
+%% start, load etc implicitly. The applications do not use start_phases
+%% i.e. the failover should be transfered to normal start type.
 failover_comp(Conf) when is_list(Conf) ->
     %% start a help process to check the start type
     StPid = spawn_link(?MODULE, start_type, []),
@@ -329,9 +325,7 @@ failover_comp(Conf) when is_list(Conf) ->
 %% Should be started in a CC view with:
 %% erl -sname XXX -rsh ctrsh where XX not in [cp1, cp2, cp3]
 %%-----------------------------------------------------------------
-permissions(suite) -> [];
-permissions(doc) ->
-    ["Tests permissions for distributed applications."];
+%% Tests permissions for distributed applications.
 permissions(Conf) when is_list(Conf) ->
 
     NodeNames = [Ncp1, Ncp2, Ncp3] = node_names([cp1, cp2, cp3], Conf),
@@ -409,9 +403,7 @@ permissions(Conf) when is_list(Conf) ->
 %% Should be started in a CC view with:
 %% erl -sname XXX -rsh ctrsh where XX not in [cp1, cp2, cp3]
 %%-----------------------------------------------------------------
-load(suite) -> [];
-load(doc) ->
-    ["Tests loading of distributed applications."];
+%% Tests loading of distributed applications.
 load(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, Ncp2, Ncp3] = node_names([cp1, cp2, cp3], Conf),
     NoSyncTime = config_fun_fast(config3(NodeNames)),
@@ -446,9 +438,7 @@ load(Conf) when is_list(Conf) ->
 %%-----------------------------------------------------------------
 %% Same test as load/1, only with code path cache enabled.
 %%-----------------------------------------------------------------
-load_use_cache(suite) -> [];
-load_use_cache(doc) ->
-    ["Tests loading of distributed applications. Code path cache enabled."];
+%% Tests loading of distributed applications. Code path cache enabled.
 load_use_cache(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, Ncp2, Ncp3] = node_names([cp1, cp2, cp3], Conf),
     NoSyncTime = config_fun_fast(config3(NodeNames)),
@@ -483,9 +473,7 @@ load_use_cache(Conf) when is_list(Conf) ->
 %% Should be started in a CC view with:
 %% erl -sname XXX -rsh ctrsh where XX not in [cp1, cp2, cp3]
 %%-----------------------------------------------------------------
-start_phases(suite) -> [];
-start_phases(doc) ->
-    ["Tests new start phases and failover."];
+%% Tests new start phases and failover.
 start_phases(Conf) when is_list(Conf) ->
     %% start a help process to check the start type
     SpPid = spawn_link(?MODULE, start_phase, []),
@@ -547,10 +535,8 @@ start_phases(Conf) when is_list(Conf) ->
     ok.
 
 
-script_start(doc) ->
-    ["Start distributed applications from within a boot script.  Test ",
-     "same as failover."];
-script_start(suite) -> [];
+%% Start distributed applications from within a boot script.  Test
+%%  same as failover.
 script_start(Conf) when is_list(Conf) ->
     %% start a help process to check the start type
     StPid = spawn_link(?MODULE, start_type, []),
@@ -662,10 +648,8 @@ script_start(Conf) when is_list(Conf) ->
 
     ok.
 
-permit_false_start_local(doc) ->
-    ["Start local applications with permission false.  Set",
-     "permit true on different nodes."];
-permit_false_start_local(suite) -> [];
+%% Start local applications with permission false.  Set
+%% permit true on different nodes.
 permit_false_start_local(Conf) when is_list(Conf) ->
     %% This configuration does not start dist_ac.
     Config = write_config_file(fun config_perm/1, Conf),
@@ -792,10 +776,8 @@ permit_false_start_local(Conf) when is_list(Conf) ->
     ok.
     
 
-permit_false_start_dist(doc) ->
-    ["Start distributed applications with permission false.  Set",
-     "permit true on different nodes."];
-permit_false_start_dist(suite) -> [];
+%% Start distributed applications with permission false.  Set
+%% permit true on different nodes.
 permit_false_start_dist(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, Ncp2, Ncp3] = node_names([cp1, cp2, cp3], Conf),
     NoSyncTime = config_fun_fast(config_perm2(NodeNames)),
@@ -927,10 +909,8 @@ permit_false_start_dist(Conf) when is_list(Conf) ->
     stop_node_nice(Cp3),
     ok.
 
-nodedown_start(doc) ->
-    ["app1 distributed as [cp1, cp2].  Call application:start(app1) on",
-     "cp2, but not on cp1.  Kill cp1.  Make sure app1 is started on cp2."];
-nodedown_start(suite) -> [];
+%% app1 distributed as [cp1, cp2].  Call application:start(app1) on
+%% cp2, but not on cp1.  Kill cp1.  Make sure app1 is started on cp2.
 nodedown_start(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, Ncp2] = node_names([cp1, cp2], Conf),
     NoSyncTime = config_fun_fast(config4(NodeNames)),
@@ -955,8 +935,7 @@ nodedown_start(Conf) when is_list(Conf) ->
     ok.
 
 
-ensure_started(suite) -> [];
-ensure_started(doc) -> ["Test application:ensure_started/1."];
+%% Test application:ensure_started/1.
 ensure_started(_Conf) ->
 
     {ok, Fd} = file:open("app1.app", [write]),
@@ -975,8 +954,7 @@ ensure_started(_Conf) ->
     ok = application:unload(app1),
     ok.
 
-ensure_all_started(suite) -> [];
-ensure_all_started(doc) -> ["Test application:ensure_all_started/1-2."];
+%% Test application:ensure_all_started/1-2.
 ensure_all_started(_Conf) ->
 
     {ok, Fd1} = file:open("app1.app", [write]),
@@ -1063,9 +1041,7 @@ ensure_all_started(_Conf) ->
 %% Ticket: OTP-1586
 %% Slogan: recursive load of applications fails
 %%-----------------------------------------------------------------
-otp_1586(suite) -> [];
-otp_1586(doc) ->
-    ["Test recursive load of applications."];
+%% Test recursive load of applications.
 otp_1586(Conf) when is_list(Conf) ->
     Dir = proplists:get_value(priv_dir,Conf),
     {ok, Fd} = file:open(filename:join(Dir, "app5.app"), [write]),
@@ -1084,9 +1060,7 @@ otp_1586(Conf) when is_list(Conf) ->
 %% Slogan: start of distrib apps fails when the nodes start
 %%         simultaneously
 %%-----------------------------------------------------------------
-otp_2078(suite) -> [];
-otp_2078(doc) ->
-    ["Test start of distrib apps fails when the nodes start simultaneously."];
+%% Test start of distrib apps fails when the nodes start simultaneously.
 otp_2078(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, Ncp2] = node_names([cp1, cp2], Conf),
     NoSyncTime = config_fun_fast(config4(NodeNames)),
@@ -1116,9 +1090,7 @@ otp_2078(Conf) when is_list(Conf) ->
     stop_node_nice(Cp2),
     ok.
 
-otp_2012(suite) -> [];
-otp_2012(doc) ->
-    ["Test change of configuration parameters without changing code."];
+%% Test change of configuration parameters without changing code.
 otp_2012(Conf) when is_list(Conf) ->
     %% start a help process to check the config change
     CcPid = spawn_link(?MODULE, conf_change, []),
@@ -1167,9 +1139,7 @@ otp_2012(Conf) when is_list(Conf) ->
 %% Ticket: OTP-2718
 %% Slogan: transient app which fails during start is ignored
 %%-----------------------------------------------------------------
-otp_2718(suite) -> [];
-otp_2718(doc) ->
-    ["Test fail of transient app at start."];
+%% Test fail of transient app at start.
 otp_2718(Conf) when is_list(Conf) ->
     {ok, Cp1} = start_node_args(cp1, "-pa " ++ proplists:get_value(data_dir,Conf)),
     wait_for_ready_net(),
@@ -1195,9 +1165,7 @@ otp_2718(Conf) when is_list(Conf) ->
 %% Ticket: OTP-2973
 %% Slogan: application:start does not test if an appl is already starting...
 %%-----------------------------------------------------------------
-otp_2973(suite) -> [];
-otp_2973(doc) ->
-    ["Test of two processes simultanously starting the same application."];
+%% Test of two processes simultanously starting the same application.
 otp_2973(Conf) when is_list(Conf) ->
     % Write a .app file
     {ok, Fd} = file:open("app0.app", [write]),
@@ -1283,11 +1251,9 @@ otp_2973(Conf) when is_list(Conf) ->
 %% Ticket: OTP-3184
 %% Slogan: crash the node if permanent appl has illegal env parameter values
 %%-----------------------------------------------------------------
-otp_3184(suite) -> [];
-otp_3184(doc) ->
-    ["When a distributed application is started the permit flag is checked "
-     "that the permit flag is not changed during the start. "
-     "Te check must only be made if the application is started on the own node"];
+%% When a distributed application is started the permit flag is checked
+%% that the permit flag is not changed during the start.
+%% The check must only be made if the application is started on the own node.
 otp_3184(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, Ncp2] = node_names([cp1, cp2], Conf),
     NoSyncTime = config_fun_fast(config3184(NodeNames)),
@@ -1331,9 +1297,7 @@ otp_3184(Conf) when is_list(Conf) ->
 %% Ticket: OTP-3002
 %% Slogan: crash the node if permanent appl has illegal env parameter values
 %%-----------------------------------------------------------------
-otp_3002(suite) -> [];
-otp_3002(doc) ->
-    ["crash the node if permanent appl has illegal env parameter values."];
+%% crash the node if permanent appl has illegal env parameter values.
 otp_3002(Conf) when is_list(Conf) ->
     % Create the boot script
     {{KernelVer,StdlibVer}, {LatestDir, LatestName}} =
@@ -1365,8 +1329,7 @@ otp_3002(Conf) when is_list(Conf) ->
 %%         when it received dist_ac_app_stopped).
 %%-----------------------------------------------------------------
 
-otp_4066(suite) -> [];
-otp_4066(doc) -> ["Check that application stop don't cause dist_ac crash"];
+%% Check that application stop don't cause dist_ac crash.
 otp_4066(Conf) when is_list(Conf) ->
     % Write config files
     [Ncp1, Ncp2] = node_names([cp1, cp2], Conf),
@@ -1444,9 +1407,7 @@ print_dac_state(Nodes) when is_list(Nodes) ->
 %% Ticket: OTP-4227
 %% Slogan: Bad return value from application.
 %%-----------------------------------------------------------------
-otp_4227(suite) -> [];
-otp_4227(doc) ->
-    ["Test start of depending app when required app crashed."];
+%% Test start of depending app when required app crashed.
 otp_4227(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, Ncp2] = node_names([cp1, cp2], Conf),
     NoSyncTime = config_fun_fast(config_4227(NodeNames)),
@@ -1537,10 +1498,8 @@ otp_5363(Conf) when is_list(Conf) ->
 %% Ticket: OTP-5606
 %% Slogan: Problems with starting a distributed application
 %%-----------------------------------------------------------------
-otp_5606(suite) -> [];
-otp_5606(doc) ->
-    ["Test of several processes simultanously starting the same "
-     "distributed application."];
+%% Test of several processes simultanously starting the same
+%% distributed application.
 otp_5606(Conf) when is_list(Conf) ->
 
     %% Write a config file
@@ -1607,9 +1566,7 @@ loop5606(Pid) ->
 	    Pid ! {self(), Res}
     end.
 	    
-get_env(suite) -> [];
-get_env(doc) ->
-    ["Tests get_env/* functions"];
+%% Tests get_env/* functions.
 get_env(Conf) when is_list(Conf) ->
     {ok, _}   = application:get_env(kernel, error_logger),
     undefined = application:get_env(undefined_app, a),
@@ -1621,9 +1578,7 @@ get_env(Conf) when is_list(Conf) ->
 %% Should be started in a CC view with:
 %% erl -sname XXX -rsh ctrsh where XX not in [cp1, cp2, cp3]
 %%-----------------------------------------------------------------
-get_key(suite) -> [];
-get_key(doc) ->
-    ["Tests read the .app keys."];
+%% Tests read the .app keys.
 get_key(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, _Ncp2, _Ncp3] = node_names([cp1, cp2, cp3], Conf),
     WithSyncTime = config_fun(config_inc(NodeNames)),
@@ -1725,8 +1680,7 @@ get_key(Conf) when is_list(Conf) ->
 %%% Testing of change of distributed parameter.
 %%%-----------------------------------------------------------------
 
-distr_changed_tc1(suite) -> [];
-distr_changed_tc1(doc) -> ["Test change of distributed parameter."];
+%% Test change of distributed parameter.
 distr_changed_tc1(Conf) when is_list(Conf) ->
 
     {OldKernel, OldEnv, {Cp1, Cp2, Cp3}, {_Ncp1, _Ncp2, _Ncp3}, _Config2} = 
@@ -1810,9 +1764,7 @@ distr_changed_tc1(Conf) when is_list(Conf) ->
 
     ok.
 
-distr_changed_tc2(suite) -> [];
-distr_changed_tc2(doc) -> ["Test change of distributed parameter, "
-			   "move appls by crashing a node."];
+%% Test change of distributed parameter, move appls by crashing a node.
 distr_changed_tc2(Conf) when is_list(Conf) ->
 
     {OldKernel, OldEnv, {Cp1, Cp2, Cp3}, {Ncp1, _Ncp2, _Ncp3}, Config2} = 
@@ -1932,10 +1884,7 @@ distr_changed_tc2(Conf) when is_list(Conf) ->
 %%%-----------------------------------------------------------------
 %%% Testing of application configuration change
 %%%-----------------------------------------------------------------
-config_change(suite) ->
-    [];
-config_change(doc) ->
-    ["Test change of application configuration"];
+%% Test change of application configuration.
 config_change(Conf) when is_list(Conf) ->
 
     %% Change to data_dir
@@ -2002,10 +1951,7 @@ get_appls([], Res) ->
     Res.
 
 
-persistent_env(suite) ->
-    [];
-persistent_env(doc) ->
-    ["Test set_env/4 and unset_env/3 with persistent true"];
+%% Test set_env/4 and unset_env/3 with persistent true.
 persistent_env(Conf) when is_list(Conf) ->
     ok = application:set_env(appinc, own2, persist, [{persistent, true}]),
     ok = application:set_env(appinc, key1, persist, [{persistent, true}]),
@@ -2049,10 +1995,7 @@ persistent_env(Conf) when is_list(Conf) ->
 %%%-----------------------------------------------------------------
 %%% Tests the 'shutdown_func' kernel config parameter
 %%%-----------------------------------------------------------------
-shutdown_func(suite) ->
-    [];
-shutdown_func(doc) ->
-    ["Tests the 'shutdown_func' kernel config parameter"];
+%% Tests the 'shutdown_func' kernel config parameter.
 shutdown_func(Config) when is_list(Config) ->
     {ok,Cp1} = start_node(?MODULE_STRING++"_shutdown_func"),
     wait_for_ready_net(),
diff --git a/lib/kernel/test/bif_SUITE.erl b/lib/kernel/test/bif_SUITE.erl
index 0f95bbd7a8..e53ae5bd8b 100644
--- a/lib/kernel/test/bif_SUITE.erl
+++ b/lib/kernel/test/bif_SUITE.erl
@@ -74,9 +74,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-spawn1(doc) -> ["Test spawn/1"];
-spawn1(suite) ->
-    [];
+%% Test spawn/1.
 spawn1(Config) when is_list(Config) ->
     ?line Node = node(),
     ?line Parent = self(),
@@ -91,9 +89,7 @@ spawn1(Config) when is_list(Config) ->
 	  end,
     ok.
 
-spawn2(doc) -> ["Test spawn/2"];
-spawn2(suite) ->
-    [];
+%% Test spawn/2.
 spawn2(Config) when is_list(Config) ->
     ?line {ok, Node} = start_node(spawn2),
 
@@ -113,9 +109,7 @@ spawn2(Config) when is_list(Config) ->
     ok.
 
 
-spawn3(doc) -> ["Test spawn/3"];
-spawn3(suite) ->
-    [];
+%% Test spawn/3.
 spawn3(Config) when is_list(Config) ->
     ?line Node = node(),
 
@@ -135,9 +129,7 @@ spawn3(Config) when is_list(Config) ->
 	  end,
     ok.
 
-spawn4(doc) -> ["Test spawn/4"];
-spawn4(suite) ->
-    [];
+%% Test spawn/4.
 spawn4(Config) when is_list(Config) ->
     ?line {ok, Node} = start_node(spawn4),
 
@@ -162,9 +154,7 @@ spawn4(Config) when is_list(Config) ->
 
 
 
-spawn_link1(doc) -> ["Test spawn_link/1"];
-spawn_link1(suite) ->
-    [];
+%% Test spawn_link/1.
 spawn_link1(Config) when is_list(Config) ->
     ?line Node = node(),
     ?line Parent = self(),
@@ -179,9 +169,7 @@ spawn_link1(Config) when is_list(Config) ->
 	  end,
     ok.
 
-spawn_link2(doc) -> ["Test spawn_link/2"];
-spawn_link2(suite) ->
-    [];
+%% Test spawn_link/2.
 spawn_link2(Config) when is_list(Config) ->
     ?line {ok, Node} = start_node(spawn_link2),
 
@@ -200,9 +188,7 @@ spawn_link2(Config) when is_list(Config) ->
     ?line true = stop_node(Node),
     ok.
 
-spawn_link3(doc) -> ["Test spawn_link/3"];
-spawn_link3(suite) ->
-    [];
+%% Test spawn_link/3.
 spawn_link3(Config) when is_list(Config) ->
     ?line Node = node(),
 
@@ -222,9 +208,7 @@ spawn_link3(Config) when is_list(Config) ->
 	  end,
     ok.
 
-spawn_link4(doc) -> ["Test spawn_link/4"];
-spawn_link4(suite) ->
-    [];
+%% Test spawn_link/4.
 spawn_link4(Config) when is_list(Config) ->
     ?line {ok, Node} = start_node(spawn_link4),
 
@@ -248,9 +232,7 @@ spawn_link4(Config) when is_list(Config) ->
     ok.
 
 
-spawn_opt2(doc) -> ["Test spawn_opt/2"];
-spawn_opt2(suite) ->
-    [];
+%% Test spawn_opt/2.
 spawn_opt2(Config) when is_list(Config) ->
     ?line Node = node(),
     ?line Parent = self(),
@@ -275,9 +257,7 @@ spawn_opt2(Config) when is_list(Config) ->
 	  end,
     ok.
 
-spawn_opt3(doc) -> ["Test spawn_opt/3"];
-spawn_opt3(suite) ->
-    [];
+%% Test spawn_opt/3.
 spawn_opt3(Config) when is_list(Config) ->
     ?line {ok, Node} = start_node(spawn_opt3),
     ?line Parent = self(),
@@ -304,9 +284,7 @@ spawn_opt3(Config) when is_list(Config) ->
     ?line true = stop_node(Node),
     ok.
 
-spawn_opt4(doc) -> ["Test spawn_opt/4"];
-spawn_opt4(suite) ->
-    [];
+%% Test spawn_opt/4.
 spawn_opt4(Config) when is_list(Config) ->
     ?line Node = node(),
     ?line Parent = self(),
@@ -336,9 +314,7 @@ spawn_opt4(Config) when is_list(Config) ->
 	  end,
     ok.
 
-spawn_opt5(doc) -> ["Test spawn_opt/5"];
-spawn_opt5(suite) ->
-    [];
+%% Test spawn_opt/5.
 spawn_opt5(Config) when is_list(Config) ->
     ?line {ok, Node} = start_node(spawn_opt5),
     ?line Parent = self(),
@@ -371,10 +347,7 @@ spawn_opt5(Config) when is_list(Config) ->
     ?line true = stop_node(Node),
     ok.
 
-spawn_failures(doc) ->
-    ["Test failure behavior of spawn bifs"];
-spawn_failures(suite) ->
-    [];
+%% Test failure behavior of spawn bifs.
 spawn_failures(Config) when is_list(Config) ->
     ?line ThisNode = node(),
     ?line {ok, Node} = start_node(spawn_remote_failure),
@@ -514,21 +487,16 @@ fetch_proc_vals(Pid) ->
     {value,{heap_size,HS}} = lists:keysearch(heap_size, 1, PI),
     ?line {Ls, P, FA, HS}.
      
-decode_packet_delim(doc) ->
-    ["Test erlang:packet_delim/3 with {line_delimiter,0} option"];
-decode_packet_delim(suite) ->
-    [];
+%% Test erlang:packet_delim/3 with {line_delimiter,0} option.
 decode_packet_delim(Config) when is_list(Config) ->
     {ok,<<"abc",0>>,<<"efg",0>>} =
         erlang:decode_packet(line, <<"abc",0,"efg",0>>, [{line_delimiter, 0}]),
     {more, undefined} = erlang:decode_packet(line, <<"abc",0,"efg",0>>, []).
 
 % This testcase should probably be moved somewhere else
-wilderness(doc) ->
-    ["Test that memory allocation command line options affecting the"
-     "wilderness of the heap are interpreted correct by the emulator "];
-wilderness(suite) ->
-    [];
+
+%% Test that memory allocation command line options affecting the
+%% wilderness of the heap are interpreted correct by the emulator.
 wilderness(Config) when is_list(Config) ->
     ?line OKParams = {512, 8},
     ?line Alloc = erlang:system_info(allocator),
diff --git a/lib/kernel/test/cleanup.erl b/lib/kernel/test/cleanup.erl
index c9f2a2a2d0..10a9f01707 100644
--- a/lib/kernel/test/cleanup.erl
+++ b/lib/kernel/test/cleanup.erl
@@ -36,7 +36,6 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-cleanup(suite) -> [];
 cleanup(_) ->
     ?line Localhost = list_to_atom(net_adm:localhost()),
     ?line net_adm:world_list([Localhost]),
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 432ada3a08..330e2a183f 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -113,8 +113,6 @@ end_per_testcase(Config) ->
     P=code:get_path(),
     ok.
 
-set_path(suite) -> [];
-set_path(doc) -> [];
 set_path(Config) when is_list(Config) ->
     P = code:get_path(),
     NonExDir = filename:join(proplists:get_value(priv_dir, Config), ?t:temp_name("hej")),
@@ -131,8 +129,6 @@ set_path(Config) when is_list(Config) ->
     [LibDir] = code:get_path(),
     ok.
 
-get_path(suite) -> [];
-get_path(doc) -> [];
 get_path(Config) when is_list(Config) ->
     P = code:get_path(),
     % test that all directories are strings (lists).
@@ -142,8 +138,6 @@ get_path(Config) when is_list(Config) ->
 	end, P),
     ok.
 
-add_path(suite) -> [];
-add_path(doc) -> [];
 add_path(Config) when is_list(Config) ->
     P = code:get_path(),
     {'EXIT',_} = (catch code:add_path({})),
@@ -164,8 +158,6 @@ add_path(Config) when is_list(Config) ->
     code:set_path(P),
     ok.
 
-add_paths(suite) -> [];
-add_paths(doc) -> [];
 add_paths(Config) when is_list(Config) ->
     P = code:get_path(),
     ok = code:add_paths([{}]),
@@ -211,8 +203,6 @@ add_paths(Config) when is_list(Config) ->
     code:set_path(P),
     ok.
 
-del_path(suite) -> [];
-del_path(doc) -> [];
 del_path(Config) when is_list(Config) ->
     P = code:get_path(),
     try
@@ -247,8 +237,6 @@ del_path_1(P) ->
     NewP1 = lists:delete(Dir,P), % check that dir is deleted
     ok.
 
-replace_path(suite) -> [];
-replace_path(doc) -> [];
 replace_path(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     P = code:get_path(),
@@ -285,8 +273,7 @@ replace_path(Config) when is_list(Config) ->
 
     ok.
 
-dir_disappeared(suite) -> [];
-dir_disappeared(doc) -> ["OTP-3977"];
+%% OTP-3977.
 dir_disappeared(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     Dir = filename:join(PrivDir, "temp"),
@@ -296,8 +283,6 @@ dir_disappeared(Config) when is_list(Config) ->
     non_existing = code:which(bubbelskrammel),
     ok.
 
-load_file(suite) -> [];
-load_file(doc) -> [];
 load_file(Config) when is_list(Config) ->
     {error, nofile} = code:load_file(duuuumy_mod),
     {error, badfile} = code:load_file(code_a_test),
@@ -312,8 +297,6 @@ load_file(Config) when is_list(Config) ->
 test_dir() ->
     filename:dirname(code:which(?MODULE)).
 
-load_abs(suite) -> [];
-load_abs(doc) -> [];
 load_abs(Config) when is_list(Config) ->
     TestDir = test_dir(),
     {error, nofile} = code:load_abs(TestDir ++ "/duuuumy_mod"),
@@ -326,8 +309,6 @@ load_abs(Config) when is_list(Config) ->
     code:unstick_dir(TestDir),
     ok.
 
-ensure_loaded(suite) -> [];
-ensure_loaded(doc) -> [];
 ensure_loaded(Config) when is_list(Config) ->
     {module, lists} = code:ensure_loaded(lists),
     case init:get_argument(mode) of
@@ -344,8 +325,6 @@ ensure_loaded(Config) when is_list(Config) ->
 	    ok
     end.
 
-delete(suite) -> [];
-delete(doc) -> [];
 delete(Config) when is_list(Config) ->
     OldFlag = process_flag(trap_exit, true),
     code:purge(code_b_test),
@@ -362,8 +341,6 @@ delete(Config) when is_list(Config) ->
     process_flag(trap_exit, OldFlag),
     ok.
 
-purge(suite) -> [];
-purge(doc) -> [];
 purge(Config) when is_list(Config) ->
     OldFlag = process_flag(trap_exit, true),
     code:purge(code_b_test),
@@ -426,8 +403,6 @@ purge_many_exits_do(PurgeF) ->
 		  end, TPids).
 
 
-soft_purge(suite) -> [];
-soft_purge(doc) -> [];
 soft_purge(Config) when is_list(Config) ->
     OldFlag = process_flag(trap_exit, true),
     code:purge(code_b_test),
@@ -444,8 +419,6 @@ soft_purge(Config) when is_list(Config) ->
     process_flag(trap_exit, OldFlag),
     ok.
 
-is_loaded(suite) -> [];
-is_loaded(doc) -> [];
 is_loaded(Config) when is_list(Config) ->
     code:purge(code_b_test),
     code:delete(code_b_test),
@@ -459,8 +432,6 @@ is_loaded(Config) when is_list(Config) ->
     code:delete(code_b_test),
     ok.
 
-all_loaded(suite) -> [];
-all_loaded(doc) -> [];
 all_loaded(Config) when is_list(Config) ->
     case ?t:is_cover() of
 	true -> {skip,"Cover is running"};
@@ -490,8 +461,6 @@ all_unique([]) -> ok;
 all_unique([_]) -> ok;
 all_unique([{X,_}|[{Y,_}|_]=T]) when X < Y -> all_unique(T).
 
-load_binary(suite) -> [];
-load_binary(doc) -> [];
 load_binary(Config) when is_list(Config) ->
     TestDir = test_dir(),
     File = TestDir ++ "/code_b_test" ++ code:objfile_extension(),
@@ -547,8 +516,6 @@ compile_load(Mod, Dir, Ver, CodeType) ->
     %IsNative = code:is_module_native(Mod),
     ok.
 
-dir_req(suite) -> [];
-dir_req(doc) -> [];
 dir_req(Config) when is_list(Config) ->
     {ok,[[Root0]]} = init:get_argument(root),
     Root = filename:join([Root0]),	% Normalised form.
@@ -563,8 +530,6 @@ dir_req(Config) when is_list(Config) ->
     {error, bad_name} = code:priv_dir(duuumy),
     ok.
 
-object_code(suite) -> [];
-object_code(doc) -> [];
 object_code(Config) when is_list(Config) ->
     TestDir = test_dir(),
     P = code:get_path(),
@@ -585,17 +550,15 @@ object_code(Config) when is_list(Config) ->
     P=code:get_path(),
     ok.
 
-set_path_file(suite) -> [];
-set_path_file(doc) -> ["Test that set_path does not accept ",
-		       "files as pathnames (known previous bug)"];
+%% Test that set_path does not accept
+%% files as pathnames (known previous bug)
 set_path_file(Config) when is_list(Config) ->
     File=filename:join(proplists:get_value(priv_dir, Config), "testfil"),
     ok=file:write_file(File, list_to_binary("lite data")),
     {error, bad_directory}=code:set_path([File]).
 
-sticky_dir(suite) -> [];
-sticky_dir(doc) -> ["Test that a module with the same name as a module in ",
-		    "a sticky directory cannot be loaded."];
+%% Test that a module with the same name as a module in
+%% a sticky directory cannot be loaded.
 sticky_dir(Config) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     {ok,Node} = ?t:start_node(sticky_dir, slave, [{args,"-pa "++Pa}]),
@@ -636,8 +599,7 @@ do_sticky_compile(Mod, Dir) ->
 	    ok
     end.
 
-pa_pz_option(suite) -> [];
-pa_pz_option(doc) -> ["Test that the -pa and -pz options work as expected"];
+%% Test that the -pa and -pz options work as expected.
 pa_pz_option(Config) when is_list(Config) ->
     DDir = proplists:get_value(data_dir,Config),
     PaDir = filename:join(DDir,"pa"),
@@ -659,9 +621,7 @@ pa_pz_option(Config) when is_list(Config) ->
     [PzDir|_] = lists:reverse(Paths2),
     ?t:stop_node(Node2).
 
-add_del_path(suite) ->
-    [];
-add_del_path(doc) -> ["add_path, del_path should not cause priv_dir(App) to fail"];
+%% add_path, del_path should not cause priv_dir(App) to fail.
 add_del_path(Config) when is_list(Config) ->
     DDir = proplists:get_value(data_dir,Config),
     Dir1 = filename:join(DDir,"dummy_app-1.0/ebin"),
@@ -726,11 +686,8 @@ clash(Config) when is_list(Config) ->
     file:delete(TmpEzFile++".moved"), %% Only effect on windows
     ok.
 
-ext_mod_dep(suite) ->
-    [];
-ext_mod_dep(doc) ->
-    ["Every module that the code_server uses should be preloaded, "
-     "this test case verifies that"];
+%% Every module that the code_server uses should be preloaded,
+%% this test case verifies that.
 ext_mod_dep(Config) when is_list(Config) ->
     xref:start(s),
     xref:set_default(s, [{verbose,false},{warnings,false},
@@ -907,10 +864,7 @@ where_is_file(Config) when is_list(Config) ->
     non_existing = code:where_is_file("kernel"), % no such file
     ok.
 
-purge_stacktrace(suite) ->
-    [];
-purge_stacktrace(doc) ->
-    ["Test that stacktrace is deleted when purging a referred module"];
+%% Test that stacktrace is deleted when purging a referred module.
 purge_stacktrace(Config) when is_list(Config) ->
     code:purge(code_b_test),
     try code_b_test:call(fun(b) -> ok end, a)
@@ -1129,11 +1083,8 @@ compile_files([File | Files], SrcDir, OutDir) ->
 compile_files([], _, _) ->
     ok.
 
-big_boot_embedded(suite) ->
-    [];
-big_boot_embedded(doc) ->
-    ["Test that a boot file with (almost) all of OTP can be used to start an"
-     " embeddedd system."];
+%% Test that a boot file with (almost) all of OTP can be used to start an
+%% embeddedd system.
 big_boot_embedded(Config) when is_list(Config) ->
     {BootArg,AppsInBoot} = create_big_boot(Config),
     {ok, Node} =
@@ -1457,8 +1408,7 @@ do_on_load_error(ReturnValue) ->
 	    {undef,[{on_load_error,main,[],_}|_]} = Exit
     end.
 
-native_early_modules(suite) -> [];
-native_early_modules(doc) -> ["Test that the native code of early loaded modules is loaded"];
+%% Test that the native code of early loaded modules is loaded.
 native_early_modules(Config) when is_list(Config) ->
     case erlang:system_info(hipe_architecture) of
 	undefined ->
@@ -1486,8 +1436,7 @@ native_early_modules_1(Architecture) ->
             ok
     end.
 
-get_mode(suite) -> [];
-get_mode(doc) -> ["Test that the mode of the code server is properly retrieved"];
+%% Test that the mode of the code server is properly retrieved.
 get_mode(Config) when is_list(Config) ->
     interactive = code:get_mode().
 
diff --git a/lib/kernel/test/disk_log_SUITE.erl b/lib/kernel/test/disk_log_SUITE.erl
index 0c3b56a101..4c5b461a3b 100644
--- a/lib/kernel/test/disk_log_SUITE.erl
+++ b/lib/kernel/test/disk_log_SUITE.erl
@@ -201,8 +201,7 @@ end_per_testcase(_Case, _Config) ->
     ok.
 
 
-halt_int_inf(suite) -> [];
-halt_int_inf(doc) -> ["Test simple halt disk log, size infinity"];
+%% Test simple halt disk log, size infinity.
 halt_int_inf(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     ?line ok = disk_log:start(),
@@ -215,8 +214,7 @@ halt_int_inf(Conf) when is_list(Conf) ->
     ?line ok = file:delete(File).
 
 
-halt_int_sz_1(suite) -> [];
-halt_int_sz_1(doc) -> ["Test simple halt disk log, size defined"];
+%% Test simple halt disk log, size defined.
 halt_int_sz_1(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -247,8 +245,7 @@ halt_int_sz_1(Conf) when is_list(Conf) ->
     ?line ok = disk_log:close(a),
     ?line ok = file:delete(File).
 
-halt_int_sz_2(suite) -> [];
-halt_int_sz_2(doc) -> ["Test simple halt disk log, size ~8192"];
+%% Test simple halt disk log, size ~8192.
 halt_int_sz_2(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File1 = filename:join(Dir, "a.LOG"),
@@ -302,8 +299,7 @@ halt_int_sz_2(Conf) when is_list(Conf) ->
     ok.
 
 
-halt_int_ro(suite) -> [];
-halt_int_ro(doc) -> ["Test simple halt disk log, read only, internal"];
+%% Test simple halt disk log, read only, internal.
 halt_int_ro(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -321,8 +317,7 @@ halt_int_ro(Conf) when is_list(Conf) ->
     ?line ok = disk_log:close(a),
     ?line ok = file:delete(File).
 
-halt_ext_ro(suite) -> [];
-halt_ext_ro(doc) -> ["Test simple halt disk log, read only, external"];
+%% Test simple halt disk log, read only, external.
 halt_ext_ro(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -338,8 +333,7 @@ halt_ext_ro(Conf) when is_list(Conf) ->
     ?line ok = disk_log:close(a),
     ?line ok = file:delete(File).
 
-wrap_int_ro(suite) -> [];
-wrap_int_ro(doc) -> ["Test simple wrap disk log, read only, internal"];
+%% Test simple wrap disk log, read only, internal.
 wrap_int_ro(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -354,8 +348,7 @@ wrap_int_ro(Conf) when is_list(Conf) ->
     ?line ok = disk_log:close(a),
     ?line del(File, 4).
 
-wrap_ext_ro(suite) -> [];
-wrap_ext_ro(doc) -> ["Test simple wrap disk log, read only, external"];
+%% Test simple wrap disk log, read only, external.
 wrap_ext_ro(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -372,8 +365,7 @@ wrap_ext_ro(Conf) when is_list(Conf) ->
     ?line ok = disk_log:close(a),
     del(File, 4).
 
-halt_trunc(suite) -> [];
-halt_trunc(doc) -> ["Test truncation of halt disk log"];
+%% Test truncation of halt disk log.
 halt_trunc(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -387,8 +379,7 @@ halt_trunc(Conf) when is_list(Conf) ->
 		       {file, File}, {mode,read_only}]),
     ?line ok = file:delete(File).
 
-halt_misc(suite) -> [];
-halt_misc(doc) -> ["Test truncation of halt disk log"];
+%% Test truncation of halt disk log.
 halt_misc(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -410,8 +401,7 @@ halt_misc(Conf) when is_list(Conf) ->
     ?line ok = disk_log:close(a),
     ?line ok = file:delete(File).
 
-halt_ro_alog(suite) -> [];
-halt_ro_alog(doc) -> ["Test truncation of halt disk log, read only"];
+%% Test truncation of halt disk log, read only.
 halt_ro_alog(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -439,8 +429,7 @@ halt_ro_alog_wait_notify(Log, T) ->
 	    failed
     end.
 
-halt_ro_balog(suite) -> [];
-halt_ro_balog(doc) -> ["Test truncation of halt disk log, read only"];
+%% Test truncation of halt disk log, read only.
 halt_ro_balog(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -468,8 +457,7 @@ halt_ro_balog_wait_notify(Log, T) ->
 	    failed
     end.
 
-halt_ro_crash(suite) -> [];
-halt_ro_crash(doc) -> ["Test truncation of halt disk log, read only, repair"];
+%% Test truncation of halt disk log, read only, repair.
 halt_ro_crash(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -503,8 +491,7 @@ halt_ro_crash(Conf) when is_list(Conf) ->
 
 
 
-wrap_int_1(suite) -> [];
-wrap_int_1(doc) -> ["Test wrap disk log, internal"];
+%% Test wrap disk log, internal.
 wrap_int_1(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -540,8 +527,7 @@ wrap_int_1(Conf) when is_list(Conf) ->
     ?line ok = disk_log:close(a),
     del(File, 4).
 
-wrap_int_2(suite) -> [];
-wrap_int_2(doc) -> ["Test wrap disk log, internal"];
+%% Test wrap disk log, internal.
 wrap_int_2(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File1 = filename:join(Dir, "a.LOG"),
@@ -587,8 +573,7 @@ wrap_int_2(Conf) when is_list(Conf) ->
     del(File2, 3),
     del(File3, 3).
 
-inc_wrap_file(suite) -> [];
-inc_wrap_file(doc) -> ["Test disk log, force a change to next file"];
+%% Test disk log, force a change to next file.
 inc_wrap_file(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File1 = filename:join(Dir, "a.LOG"),
@@ -650,8 +635,7 @@ inc_wrap_file(Conf) when is_list(Conf) ->
 
 
 
-halt_ext_inf(suite) -> [];
-halt_ext_inf(doc) -> ["Test halt disk log, external, infinity"];
+%% Test halt disk log, external, infinity.
 halt_ext_inf(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -663,8 +647,7 @@ halt_ext_inf(Conf) when is_list(Conf) ->
     ?line ok = file:delete(File).
 
 
-halt_ext_sz_1(suite) -> [];
-halt_ext_sz_1(doc) -> ["Test halt disk log, external, size defined"];
+%% Test halt disk log, external, size defined.
 halt_ext_sz_1(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -697,8 +680,7 @@ halt_ext_sz_1(Conf) when is_list(Conf) ->
     ?line ok = disk_log:close(a),
     ?line ok = file:delete(File).
 
-halt_ext_sz_2(suite) -> [];
-halt_ext_sz_2(doc) -> ["Test halt disk log, external, size defined"];
+%% Test halt disk log, external, size defined.
 halt_ext_sz_2(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File1 = filename:join(Dir, "a.LOG"),
@@ -754,8 +736,7 @@ halt_ext_sz_2(Conf) when is_list(Conf) ->
     ok.
 
 
-wrap_ext_1(suite) -> [];
-wrap_ext_1(doc) -> ["Test wrap disk log, external, size defined"];
+%% Test wrap disk log, external, size defined.
 wrap_ext_1(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -806,8 +787,7 @@ wrap_ext_1(Conf) when is_list(Conf) ->
     ?line ok = disk_log:close(a),
     del(File, 4).
 
-wrap_ext_2(suite) -> [];
-wrap_ext_2(doc) -> ["Test wrap disk log, external, size defined"];
+%% Test wrap disk log, external, size defined.
 wrap_ext_2(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File1 = filename:join(Dir, "a.LOG"),
@@ -1166,8 +1146,7 @@ end_times({T1,W1}) ->
     {T2-T1, W2-W1}.
 
 
-head_func(suite) -> [];
-head_func(doc) -> ["Test head parameter"];
+%% Test head parameter.
 head_func(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -1243,8 +1222,7 @@ hf() ->
     ets:update_counter(xxx, wrapc, 1),
     {ok, [1,2,3]}.
 
-plain_head(suite) -> [];
-plain_head(doc) -> ["Test head parameter"];
+%% Test head parameter.
 plain_head(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -1273,8 +1251,7 @@ plain_head(Conf) when is_list(Conf) ->
 
 
 
-one_header(suite) -> [];
-one_header(doc) -> ["Test that a header is just printed once in a log file"];
+%% Test that a header is just printed once in a log file.
 one_header(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -1345,8 +1322,7 @@ one_header(Conf) when is_list(Conf) ->
 
 
 
-wrap_notif(suite) -> [];
-wrap_notif(doc) -> ["Test notify parameter, wrap"];
+%% Test notify parameter, wrap.
 wrap_notif(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -1363,8 +1339,7 @@ wrap_notif(Conf) when is_list(Conf) ->
     disk_log:close(a),
     del(File, 4).
 
-full_notif(suite) -> [];
-full_notif(doc) -> ["Test notify parameter, wrap, filled file"];
+%% Test notify parameter, wrap, filled file.
 full_notif(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -1379,8 +1354,7 @@ full_notif(Conf) when is_list(Conf) ->
     disk_log:close(a),
     file:delete(File).
 
-trunc_notif(suite) -> [];
-trunc_notif(doc) -> ["Test notify parameter, wrap, truncated file"];
+%% Test notify parameter, wrap, truncated file.
 trunc_notif(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
@@ -1398,9 +1372,7 @@ trunc_notif(Conf) when is_list(Conf) ->
     file:delete(File),
     file:delete(File2).
 
-blocked_notif(suite) -> [];
-blocked_notif(doc) -> 
-    ["Test notify parameters 'format_external' and 'blocked_log"];
+%% Test notify parameters 'format_external' and 'blocked_log.
 blocked_notif(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "n.LOG"),
@@ -1429,8 +1401,7 @@ blocked_notif(Conf) when is_list(Conf) ->
     ?line del(File, No).
 
 
-new_idx_vsn(suite) -> [];
-new_idx_vsn(doc) -> ["Test the new version of the .idx file"];
+%% Test the new version of the .idx file.
 new_idx_vsn(Conf) when is_list(Conf) ->
     DataDir = ?datadir(Conf),
     PrivDir = ?privdir(Conf),
@@ -1477,9 +1448,7 @@ new_idx_vsn(Conf) when is_list(Conf) ->
 
     ok.
 
-reopen(suite) -> [];
-reopen(doc) -> 
-    ["Test reopen/1 on halt and wrap logs."];
+%% Test reopen/1 on halt and wrap logs.
 reopen(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
@@ -1569,9 +1538,7 @@ reopen(Conf) when is_list(Conf) ->
     ok.
 
 
-block_blocked(suite) -> [];
-block_blocked(doc) -> 
-    ["Test block/1 on external and internal logs."];
+%% Test block/1 on external and internal logs.
 block_blocked(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
@@ -1645,9 +1612,7 @@ block_blocked(Conf) when is_list(Conf) ->
     ?line ok = disk_log:close(halt),
     ?line del(File, No).
 
-block_queue(suite) -> [];
-block_queue(doc) -> 
-    ["Run commands from the queue by unblocking."];
+%% Run commands from the queue by unblocking.
 block_queue(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
@@ -1790,9 +1755,7 @@ block_queue(Conf) when is_list(Conf) ->
     ?line true = (P0 == pps()),
     ok.
 
-block_queue2(suite) -> [];
-block_queue2(doc) -> 
-    ["OTP-4880. Blocked processes did not get disk_log_stopped message."];
+%% OTP-4880. Blocked processes did not get disk_log_stopped message.
 block_queue2(Conf) when is_list(Conf) ->
     ?line Q = qlen(),
     ?line P0 = pps(),
@@ -1825,9 +1788,7 @@ block_queue2(Conf) when is_list(Conf) ->
     ok.
 
 
-unblock(suite) -> [];
-unblock(doc) -> 
-    ["Test unblock/1."];
+%% Test unblock/1.
 unblock(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "n.LOG"),
@@ -1846,9 +1807,7 @@ try_unblock(Log) ->
     ?line "The disk log" ++ _ = format_error(Error).
 
 
-open_overwrite(suite) -> [];
-open_overwrite(doc) -> 
-    ["Test open/1 when old files exist."];
+%% Test open/1 when old files exist.
 open_overwrite(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
@@ -1933,9 +1892,7 @@ make_file(Dir, File, N) ->
     end,
     ok = file:close(F).
 
-open_size(suite) -> [];
-open_size(doc) -> 
-    ["Test open/1 option size."];
+%% Test open/1 option size.
 open_size(Conf) when is_list(Conf) ->
 
     ?line Dir = ?privdir(Conf),
@@ -1986,9 +1943,7 @@ open_size(Conf) when is_list(Conf) ->
     ok.
 
 
-open_truncate(suite) -> [];
-open_truncate(doc) -> 
-    ["Test open/1 with {repair, truncate}."];
+%% Test open/1 with {repair, truncate}.
 open_truncate(Conf) when is_list(Conf) ->
 
     ?line Dir = ?privdir(Conf),
@@ -2010,9 +1965,7 @@ open_truncate(Conf) when is_list(Conf) ->
     ok.
     
 
-open_error(suite) -> [];
-open_error(doc) -> 
-    ["Try some invalid open/1 options."];
+%% Try some invalid open/1 options.
 open_error(Conf) when is_list(Conf) ->
     ?line Dir = ?privdir(Conf),
 
@@ -2093,9 +2046,7 @@ open_error(Conf) when is_list(Conf) ->
     ?line del(File, No).    
 
 
-close_race(suite) -> [];
-close_race(doc) -> 
-    ["Do something quickly after close/1"];
+%% Do something quickly after close/1.
 close_race(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     ?line File = filename:join(Dir, "n.LOG"),
@@ -2147,9 +2098,7 @@ close_race(Conf) when is_list(Conf) ->
     ?line del(File, No),  % cleanup
     ok.
 
-close_block(suite) -> [];
-close_block(doc) -> 
-    ["Block, unblock, close, terminate."];
+%% Block, unblock, close, terminate.
 close_block(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
@@ -2341,9 +2290,7 @@ close_block(Conf) when is_list(Conf) ->
     del(File, No),	% cleanup
     ok.
 
-close_deadlock(suite) -> [];
-close_deadlock(doc) -> 
-    ["OTP-4745. Deadlock with just an ordinary log could happen."];
+%% OTP-4745. Deadlock with just an ordinary log could happen.
 close_deadlock(Conf) when is_list(Conf) ->
     ?line true = is_alive(),
 
@@ -2514,9 +2461,7 @@ lserv(Log) ->
     lserv(Log).
 
 
-error_repair(suite) -> [];
-error_repair(doc) -> 
-    ["Error while repairing."];
+%% Error while repairing.
 error_repair(Conf) when is_list(Conf) ->
     % not all error situations are covered by this test
 
@@ -2642,9 +2587,7 @@ set_opened(File) ->
     ok = file:write(Fd, [?LOGMAGIC, ?OPENED]),
     ok = file:close(Fd).
 
-error_log(suite) -> [];
-error_log(doc) -> 
-    ["Error while repairing."];
+%% Error while repairing.
 error_log(Conf) when is_list(Conf) ->
     ?line Dir = ?privdir(Conf),
 
@@ -2737,9 +2680,7 @@ error_log(Conf) when is_list(Conf) ->
     ?line Q = qlen(),
     ok.
     
-chunk(suite) -> [];
-chunk(doc) -> 
-    ["Test chunk and chunk_step."];
+%% Test chunk and chunk_step.
 chunk(Conf) when is_list(Conf) ->
     %% See also halt_ro_crash/1 above.
 
@@ -3033,9 +2974,7 @@ chunk(Conf) when is_list(Conf) ->
 
     ok.
 
-error_index(suite) -> [];
-error_index(doc) -> 
-    ["OTP-5558. Keep the contents of index files after disk crash."];
+%% OTP-5558. Keep the contents of index files after disk crash.
 error_index(Conf) when is_list(Conf) ->
     ?line Dir = ?privdir(Conf),
 
@@ -3060,9 +2999,7 @@ error_index(Conf) when is_list(Conf) ->
     ?line true = (Q == qlen()),
     ok.
     
-truncate(suite) -> [];
-truncate(doc) -> 
-    ["Test truncate/1 on halt and wrap logs."];
+%% Test truncate/1 on halt and wrap logs.
 truncate(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
 
@@ -3169,9 +3106,7 @@ truncate(Conf) when is_list(Conf) ->
     ok.
 
 
-many_users(suite) -> [];
-many_users(doc) -> 
-    ["Test many users logging and sync:ing at the same time."];
+%% Test many users logging and sync:ing at the same time.
 many_users(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     N = 100,
@@ -3231,9 +3166,7 @@ del_files(_Size, File) ->
 
 
 
-info_current(suite) -> [];
-info_current(doc) -> 
-    ["Test no_current_{bytes, items} as returned by info/0."];
+%% Test no_current_{bytes, items} as returned by info/0.
 info_current(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
@@ -3435,7 +3368,6 @@ info_current(Conf) when is_list(Conf) ->
 
 
 
-change_size_before(suite) -> [];
 change_size_before(doc) -> 
     ["Change size of a wrap log file before we have reached "
      "to the file index corresponding to the new size"];
@@ -3586,9 +3518,8 @@ change_size_before(Conf) when is_list(Conf) ->
 
 
 
-change_size_during(suite) -> [];
-change_size_during(doc) -> ["Change size of a wrap log file while logging  "
-			    "to a file index between the old and the new size"];
+%% Change size of a wrap log file while logging to a file index
+%% between the old and the new size.
 change_size_during(Conf) when is_list(Conf) ->
 
     Log_1_1 = "first log  first message",
@@ -3715,11 +3646,8 @@ change_size_during(Conf) when is_list(Conf) ->
     del(File, 5).
 
 
-change_size_after(suite) -> [];
-change_size_after(doc) -> 
-    ["Change size of a wrap log file before we have reached "
-     "(on the second round) "
-     "to the file index corresponding to the new size"];
+%% Change size of a wrap log file before we have reached (on the
+%% second round) to the file index corresponding to the new size.
 change_size_after(Conf) when is_list(Conf) ->
 
     Log_1_1 = "first log  first message",
@@ -3815,8 +3743,7 @@ change_size_after(Conf) when is_list(Conf) ->
 
 
 
-default_size(suite) -> [];
-default_size(doc) -> ["Open an existing wrap log without size option "];
+%% Open an existing wrap log without size option .
 default_size(Conf) when is_list(Conf) ->
     ?line Dir = ?privdir(Conf),
     ?line File = filename:join(Dir, "a.LOG"),
@@ -3832,8 +3759,7 @@ default_size(Conf) when is_list(Conf) ->
     ?line ok = disk_log:close(a),
     ?line del(File, 5).
 
-change_size2(suite) -> [];
-change_size2(doc) -> ["Testing change_size/2 a bit more..."];
+%% Testing change_size/2 a bit more...
 change_size2(Conf) when is_list(Conf) ->
     
     Dir = ?privdir(Conf),
@@ -3895,8 +3821,7 @@ change_size2(Conf) when is_list(Conf) ->
     ?line ok = disk_log:close(n),
     ?line del(File, No).
 
-change_size_truncate(suite) -> [];
-change_size_truncate(doc) -> ["OTP-3484: truncating index file"];
+%% OTP-3484: truncating index file.
 change_size_truncate(Conf) when is_list(Conf) ->
     
     Dir = ?privdir(Conf),
@@ -4029,9 +3954,7 @@ change_size_truncate(Conf) when is_list(Conf) ->
     ?line del(File, No),
     ok.
 
-change_attribute(suite) -> [];
-change_attribute(doc) -> 
-    ["Change notify and head"];
+%% Change notify and head.
 change_attribute(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
@@ -4103,9 +4026,7 @@ change_attribute(Conf) when is_list(Conf) ->
     ?line del(File, No).
     
 
-dist_open(suite) -> [];
-dist_open(doc) -> 
-    ["Open a distributed log"];
+%% Open a distributed log.
 dist_open(Conf) when is_list(Conf) ->
     ?line PrivDir = ?privdir(Conf),
     ?line true = is_alive(),
@@ -4208,9 +4129,7 @@ dist_open(Conf) when is_list(Conf) ->
     ?line stop_node(Node),
     ok.
     
-dist_error_open(suite) -> [];
-dist_error_open(doc) -> 
-    ["Open a log distributed and not distributed"];
+%% Open a log distributed and not distributed.
 dist_error_open(Conf) when is_list(Conf) ->
     ?line PrivDir = ?privdir(Conf),
     ?line true = is_alive(),
@@ -4261,9 +4180,7 @@ dist_error_open(Conf) when is_list(Conf) ->
     ?line stop_node(Node),
     ok.
 
-dist_notify(suite) -> [];
-dist_notify(doc) -> 
-    ["Notification from other node"];
+%% Notification from other node.
 dist_notify(Conf) when is_list(Conf) ->
     ?line PrivDir = ?privdir(Conf),
     ?line true = is_alive(),
@@ -4303,9 +4220,7 @@ dist_notify(Conf) when is_list(Conf) ->
     ?line stop_node(Node),
     ok.
 
-dist_terminate(suite) -> [];
-dist_terminate(doc) -> 
-    ["Terminating nodes with distributed logs"];
+%% Terminating nodes with distributed logs.
 dist_terminate(Conf) when is_list(Conf) ->
     ?line Dir = ?privdir(Conf),
     ?line true = is_alive(),
@@ -4360,9 +4275,7 @@ dist_terminate(Conf) when is_list(Conf) ->
     ?line stop_node(Node),
     ok.
 
-dist_accessible(suite) -> [];
-dist_accessible(doc) -> 
-    ["Accessible logs on nodes"];
+%% Accessible logs on nodes.
 dist_accessible(Conf) when is_list(Conf) ->
     ?line PrivDir = ?privdir(Conf),
 
@@ -4430,9 +4343,7 @@ dist_accessible(Conf) when is_list(Conf) ->
     ?line stop_node(Node),
     ok.
 
-dist_deadlock(suite) -> [];
-dist_deadlock(doc) -> 
-    ["OTP-4405. Deadlock between two nodes could happen."];
+%% OTP-4405. Deadlock between two nodes could happen.
 dist_deadlock(Conf) when is_list(Conf) ->
     ?line PrivDir = ?privdir(Conf),
 
@@ -4471,9 +4382,7 @@ dist_dl(Node, Name, File, Pid) ->
     Pid ! {self(), Name},
     ok.
 
-dist_open2(suite) -> [];
-dist_open2(doc) -> 
-    ["OTP-4480. Opening several logs simultaneously."];
+%% OTP-4480. Opening several logs simultaneously.
 dist_open2(Conf) when is_list(Conf) ->
     ?line true = is_alive(),
     ?line {ok, _Pg2} = pg2:start(),
@@ -4730,9 +4639,7 @@ log_terms(Log, N) ->
     ok = disk_log:log(Log, {term, N}),
     log_terms(Log, N-1).
 
-other_groups(suite) -> [];
-other_groups(doc) -> 
-    ["OTP-5810. Cope with pg2 groups that are not disk logs."];
+%% OTP-5810. Cope with pg2 groups that are not disk logs.
 other_groups(Conf) when is_list(Conf) ->
     ?line true = is_alive(),
     ?line PrivDir = ?privdir(Conf),
@@ -4760,8 +4667,7 @@ other_groups(Conf) when is_list(Conf) ->
     ok.
 
 -define(MAX, 16384). % MAX in disk_log_1.erl
-evil(suite) -> [];
-evil(doc) -> ["Evil cases such as closed file descriptor port."];
+%% Evil cases such as closed file descriptor port.
 evil(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "n.LOG"),
@@ -4873,8 +4779,7 @@ setup_evil_filled_cache(Log, Args, Dir) ->
     exit(Fd, kill),
     ok.
 
-otp_6278(suite) -> [];
-otp_6278(doc) -> ["OTP-6278. open/1 creates no status or crash report."];
+%% OTP-6278. open/1 creates no status or crash report.
 otp_6278(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "no_such_dir/no_such_file"),
@@ -4890,8 +4795,7 @@ otp_6278(Conf) when is_list(Conf) ->
     end,
     ?line error_logger:delete_report_handler(?MODULE).
 
-otp_10131(suite) -> [];
-otp_10131(doc) -> ["OTP-10131. head_func type."];
+%% OTP-10131. head_func type.
 otp_10131(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     Log = otp_10131,
diff --git a/lib/kernel/test/erl_boot_server_SUITE.erl b/lib/kernel/test/erl_boot_server_SUITE.erl
index f416093e17..2f17ab0878 100644
--- a/lib/kernel/test/erl_boot_server_SUITE.erl
+++ b/lib/kernel/test/erl_boot_server_SUITE.erl
@@ -59,7 +59,7 @@ end_per_group(_GroupName, Config) ->
 
 -define(all_ones, {255, 255, 255, 255}).
 
-start(doc) -> "Tests the erl_boot_server:start/1 function.";
+%% Tests the erl_boot_server:start/1 function.
 start(Config) when is_list(Config) ->
     ?line [Host1, Host2|_] = good_hosts(Config),
 
@@ -88,7 +88,7 @@ start(Config) when is_list(Config) ->
 
     ok.
 
-start_link(doc) -> "Tests the erl_boot_server:start_link/1 function.";
+%% Tests the erl_boot_server:start_link/1 function.
 start_link(Config) when is_list(Config) ->
     ?line [Host1, Host2|_] = good_hosts(Config),
 
@@ -112,7 +112,7 @@ start_link(Config) when is_list(Config) ->
 
     ok.
 
-stop(doc) -> "Tests that no processes are left if a boot server is killed.";
+%% Tests that no processes are left if a boot server is killed.
 stop(Config) when is_list(Config) ->
     ?line [Host1|_] = good_hosts(Config),
 
@@ -134,7 +134,7 @@ stop(Config) when is_list(Config) ->
 	  end,
     ok.
 
-add(doc) -> "Tests the erl_boot_server:add/1 function.";
+%% Tests the erl_boot_server:add/1 function.
 add(Config) when is_list(Config) ->
     ?line OldFlag = process_flag(trap_exit, true),
     ?line {ok, Pid1} = erl_boot_server:start_link([]),
@@ -177,7 +177,7 @@ add(Config) when is_list(Config) ->
     ?line process_flag(trap_exit, OldFlag),
     ok.
 
-delete(doc) -> "Tests the erl_boot_server:delete/1 function.";
+%% Tests the erl_boot_server:delete/1 function.
 delete(Config) when is_list(Config) ->
     ?line OldFlag = process_flag(trap_exit, true),
 
@@ -222,7 +222,7 @@ delete(Config) when is_list(Config) ->
     ?line process_flag(trap_exit, OldFlag),
     ok.
 
-responses(doc) -> "Tests erl_boot_server responses to slave requests.";
+%% Tests erl_boot_server responses to slave requests.
 responses(Config) when is_list(Config) ->
     ?line process_flag(trap_exit, true),
     %% Copy from inet_boot.hrl
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index 2c26880a3f..ebbcdcbaf2 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -98,8 +98,6 @@ init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
 end_per_testcase(_Func, _Config) ->
     ok.
 
-tick(suite) -> [];
-tick(doc) -> [];
 tick(Config) when is_list(Config) ->
     PaDir = filename:dirname(code:which(erl_distribution_SUITE)),
     
@@ -163,10 +161,7 @@ tick(Config) when is_list(Config) ->
     end,
     ok.
 
-table_waste(doc) ->
-    ["Checks that pinging nonexistyent nodes does not waste space in distribution table"];
-table_waste(suite) ->
-    [];
+%% Checks that pinging nonexistyent nodes does not waste space in distribution table.
 table_waste(Config) when is_list(Config) ->
     ?line {ok, HName} = inet:gethostname(), 
     F = fun(0,_F) -> [];
@@ -183,10 +178,7 @@ table_waste(Config) when is_list(Config) ->
     
     
 
-illegal_nodenames(doc) ->
-    ["Test that pinging an illegal nodename does not kill the node"];
-illegal_nodenames(suite) ->
-    [];
+%% Test that pinging an illegal nodename does not kill the node.
 illegal_nodenames(Config) when is_list(Config) ->
     PaDir = filename:dirname(code:which(erl_distribution_SUITE)),
     ?line {ok, Node}=start_node(illegal_nodenames, "-pa " ++ PaDir),
@@ -209,7 +201,7 @@ pinger(Starter) ->
     ok.
 
 
-net_setuptime(doc) -> ["Test that you can set the net_setuptime properly"];
+%% Test that you can set the net_setuptime properly.
 net_setuptime(Config) when is_list(Config) ->
     %% In this test case, we reluctantly accept shorter times than the given
     %% setup time, because the connection attempt can end in a
@@ -292,8 +284,7 @@ tick_cli_test1(Node) ->
     end.
 
 
-tick_change(doc) -> ["OTP-4255"];
-tick_change(suite) -> [];
+%% OTP-4255.
 tick_change(Config) when is_list(Config) ->
     ?line PaDir = filename:dirname(code:which(?MODULE)),
     ?line [BN, CN] = get_nodenames(2, tick_change),
@@ -468,10 +459,7 @@ run_tick_change_test(B, C, PrevTT, TT, PaDir) ->
 %%
 %% Basic tests of hidden node.
 %%
-hidden_node(doc) ->
-    ["Basic test of hidden node"];
-hidden_node(suite) ->
-    [];
+%% Basic test of hidden node.
 hidden_node(Config) when is_list(Config) ->
     PaDir = filename:dirname(code:which(?MODULE)),
     VArgs = "-pa " ++ PaDir,
@@ -554,9 +542,7 @@ check_monitor_nodes_res(Pid, Node) ->
 
 
 
-inet_dist_options_options(suite) -> [];
-inet_dist_options_options(doc) ->
-    ["Check the kernel inet_dist_{listen,connect}_options options"];
+%% Check the kernel inet_dist_{listen,connect}_options options.
 inet_dist_options_options(Config) when is_list(Config) ->
     Prio = 1,
     case gen_udp:open(0, [{priority,Prio}]) of
@@ -624,8 +610,6 @@ get_socket_priorities() ->
 %%   monitor_nodes_nodedown_reason
 %%
 
-monitor_nodes_nodedown_reason(doc) -> [];
-monitor_nodes_nodedown_reason(suite) -> [];
 monitor_nodes_nodedown_reason(Config) when is_list(Config) ->
     ?line MonNodeState = monitor_node_state(),
     ?line ok = net_kernel:monitor_nodes(true),
@@ -679,8 +663,6 @@ monitor_nodes_nodedown_reason(Config) when is_list(Config) ->
     ?line ok.
 
 
-monitor_nodes_complex_nodedown_reason(doc) -> [];
-monitor_nodes_complex_nodedown_reason(suite) -> [];
 monitor_nodes_complex_nodedown_reason(Config) when is_list(Config) ->
     ?line MonNodeState = monitor_node_state(),
     ?line Me = self(),
@@ -724,8 +706,6 @@ monitor_nodes_complex_nodedown_reason(Config) when is_list(Config) ->
 %%   monitor_nodes_node_type
 %%
 
-monitor_nodes_node_type(doc) -> [];
-monitor_nodes_node_type(suite) -> [];
 monitor_nodes_node_type(Config) when is_list(Config) ->
     ?line MonNodeState = monitor_node_state(),
     ?line ok = net_kernel:monitor_nodes(true),
@@ -804,8 +784,6 @@ monitor_nodes_node_type(Config) when is_list(Config) ->
 %%   monitor_nodes
 %%
 
-monitor_nodes_misc(doc) -> [];
-monitor_nodes_misc(suite) -> [];
 monitor_nodes_misc(Config) when is_list(Config) ->
     ?line MonNodeState = monitor_node_state(),
     ?line ok = net_kernel:monitor_nodes(true),
@@ -853,12 +831,9 @@ monitor_nodes_misc(Config) when is_list(Config) ->
     ?line ok.
 
 
-monitor_nodes_otp_6481(doc) ->
-    ["Tests that {nodeup, Node} messages are received before "
-     "messages from Node and that {nodedown, Node} messages are"
-     "received after messages from Node"];
-monitor_nodes_otp_6481(suite) ->
-    [];
+%% Tests that {nodeup, Node} messages are received before
+%% messages from Node and that {nodedown, Node} messages are
+%% received after messages from Node.
 monitor_nodes_otp_6481(Config) when is_list(Config) ->
     io:format("Testing nodedown...~n"),
     ?line monitor_nodes_otp_6481_test(Config, nodedown),
@@ -968,10 +943,6 @@ node_loop_send(Pid, Msg, No) ->
     Pid ! {Msg, No},
     node_loop_send(Pid, Msg, No + 1).
 
-monitor_nodes_errors(doc) ->
-    [];
-monitor_nodes_errors(suite) ->
-    [];
 monitor_nodes_errors(Config) when is_list(Config) ->
     ?line MonNodeState = monitor_node_state(),
     ?line error = net_kernel:monitor_nodes(asdf),
@@ -1005,10 +976,6 @@ monitor_nodes_errors(Config) when is_list(Config) ->
     ?line MonNodeState = monitor_node_state(),
     ?line ok.
 
-monitor_nodes_combinations(doc) ->
-    [];
-monitor_nodes_combinations(suite) ->
-    [];
 monitor_nodes_combinations(Config) when is_list(Config) ->
     ?line MonNodeState = monitor_node_state(),
     ?line monitor_nodes_all_comb(true),
@@ -1127,10 +1094,6 @@ receive_mn_msgs(Msgs) ->
 		     expected_messages, Msgs})
     end.
 
-monitor_nodes_cleanup(doc) ->
-    [];
-monitor_nodes_cleanup(suite) ->
-    [];
 monitor_nodes_cleanup(Config) when is_list(Config) ->
     ?line MonNodeState = monitor_node_state(),
     ?line Me = self(),
@@ -1159,10 +1122,6 @@ monitor_nodes_cleanup(Config) when is_list(Config) ->
     ?line no_msgs(),
     ?line ok.
 
-monitor_nodes_many(doc) ->
-    [];
-monitor_nodes_many(suite) ->
-    [];
 monitor_nodes_many(Config) when is_list(Config) ->
     ?line MonNodeState = monitor_node_state(),
     ?line [Name] = get_nodenames(1, monitor_nodes_many),
diff --git a/lib/kernel/test/erl_distribution_wb_SUITE.erl b/lib/kernel/test/erl_distribution_wb_SUITE.erl
index 07e6dbbc86..bf332366ed 100644
--- a/lib/kernel/test/erl_distribution_wb_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_wb_SUITE.erl
@@ -108,11 +108,10 @@ init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
 end_per_testcase(_Func, _Config) ->
     ok.
 
-switch_options(doc) ->
-    ["Tests switching of options for the tcp port, as this is done"
-     " when the distribution port is to be shortcut into the emulator."
-     " Maybe this should be in the inet test suite, but only the distribution"
-     " does such horrible things..."];
+%% Tests switching of options for the tcp port, as this is done
+%% when the distribution port is to be shortcut into the emulator.
+%% Maybe this should be in the inet test suite, but only the distribution
+%% does such horrible things...
 switch_options(Config) when is_list(Config) ->
     ok = test_switch_active(),
     ok = test_switch_active_partial() ,
@@ -120,10 +119,7 @@ switch_options(Config) when is_list(Config) ->
     ok.
     
 
-whitebox(doc) ->
-    ["Whitebox testing of distribution handshakes. Tests both BC with R5 and "
-     "the md5 version. Note that after R6B, this should be revised to "
-     "remove BC code."];
+%% Whitebox testing of distribution handshakes.
 whitebox(Config) when is_list(Config) ->
     ?line {ok, Node} = start_node(?MODULE,""),
     ?line Cookie = erlang:get_cookie(),
@@ -360,7 +356,6 @@ simultaneous_md5(Node, OurName, Cookie) when OurName > Node ->
     ?line gen_tcp:close(EpmdSocket),
     ok.
 
-missing_compulsory_dflags(doc) -> [];
 missing_compulsory_dflags(Config) when is_list(Config) ->
     ?line [Name1, Name2] = get_nodenames(2, missing_compulsory_dflags),
     ?line {ok, Node} = start_node(Name1,""),
diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl
index a8e610a7d8..3043af8d73 100644
--- a/lib/kernel/test/erl_prim_loader_SUITE.erl
+++ b/lib/kernel/test/erl_prim_loader_SUITE.erl
@@ -72,7 +72,6 @@ init_per_testcase(_Func, Config) ->
 end_per_testcase(_Func, _Config) ->
     ok.
 
-get_path(doc) -> [];
 get_path(Config) when is_list(Config) ->
     ?line case erl_prim_loader:get_path() of
 	      {ok, Path} when is_list(Path) ->
@@ -82,7 +81,6 @@ get_path(Config) when is_list(Config) ->
 	  end,
     ok.
 
-set_path(doc) -> [];
 set_path(Config) when is_list(Config) ->
     ?line {ok, Path} = erl_prim_loader:get_path(),
     ?line ok = erl_prim_loader:set_path(Path),
@@ -98,7 +96,6 @@ set_path(Config) when is_list(Config) ->
     ?line {ok, Path} = erl_prim_loader:get_path(),
     ok.
 
-get_file(doc) -> [];
 get_file(Config) when is_list(Config) ->
     ?line case erl_prim_loader:get_file("lists" ++ code:objfile_extension()) of
 	      {ok,Bin,File} when is_binary(Bin), is_list(File) ->
@@ -162,8 +159,8 @@ test_normalize_and_backslash(Config) ->
     ok = file:del_dir(Dir),
     ok.
 
-inet_existing(doc) -> ["Start a node using the 'inet' loading method, ",
-		       "from an already started boot server."];
+%% Start a node using the 'inet' loading method,
+%% from an already started boot server.
 inet_existing(Config) when is_list(Config) ->
     Name = erl_prim_test_inet_existing,
     BootPid = start_boot_server(),
@@ -174,8 +171,8 @@ inet_existing(Config) when is_list(Config) ->
     exit(BootPid, kill),
     ok.
 
-inet_coming_up(doc) -> ["Start a node using the 'inet' loading method, ",
-			"but start the boot server afterwards."];
+%% Start a node using the 'inet' loading method,
+%% but start the boot server afterwards.
 inet_coming_up(Config) when is_list(Config) ->
     Name = erl_prim_test_inet_coming_up,
     Node = start_node_using_inet(Name, [{wait,false}]),
@@ -203,8 +200,8 @@ wait_really_started(Node, N) ->
  	    wait_really_started(Node, N - 1)
     end.
 
-inet_disconnects(doc) -> ["Start a node using the 'inet' loading method, ",
-			  "then lose the connection."];
+%% Start a node using the 'inet' loading method,
+%% then lose the connection.
 inet_disconnects(Config) when is_list(Config) ->
     case test_server:is_native(erl_boot_server) of
 	true ->
@@ -270,9 +267,8 @@ get_calls(Count, Pid) ->
 	    {error,{trace_msg_timeout,Count}}
     end.	
 
-multiple_slaves(doc) ->
-    ["Start nodes in parallell, all using the 'inet' loading method, ",
-     "verify that the boot server manages"];
+%% Start nodes in parallel, all using the 'inet' loading method;
+%% verify that the boot server manages.
 multiple_slaves(Config) when is_list(Config) ->
     ?line Name = erl_prim_test_multiple_slaves,
     ?line Host = host(),
@@ -322,8 +318,8 @@ wait_and_shutdown([], _) ->
     ok.
 
 
-file_requests(doc) -> ["Start a node using the 'inet' loading method, ",
-		       "verify that the boot server responds to file requests."];
+%% Start a node using the 'inet' loading method,
+%% verify that the boot server responds to file requests.
 file_requests(Config) when is_list(Config) ->
     ?line {ok, Node, BootPid} = complete_start_node(erl_prim_test_file_req),
 
@@ -373,10 +369,7 @@ file_requests(Config) when is_list(Config) ->
     ?line exit(BootPid, kill),
     ok.
 
-local_archive(suite) ->
-    [];
-local_archive(doc) ->
-    ["Read files from local archive."];
+%% Read files from local archive.
 local_archive(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     KernelDir = filename:basename(code:lib_dir(kernel)),
@@ -393,10 +386,7 @@ local_archive(Config) when is_list(Config) ->
     ?line ok = file:delete(Archive),
     ok.
 
-remote_archive(suite) ->
-    {req, [{local_slave_nodes, 1}, {time, 10}]};
-remote_archive(doc) ->
-    ["Read files from remote archive."];
+%% Read files from remote archive.
 remote_archive(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     KernelDir = filename:basename(code:lib_dir(kernel)),
@@ -415,10 +405,7 @@ remote_archive(Config) when is_list(Config) ->
     ?line exit(BootPid, kill),
     ok.
 
-primary_archive(suite) ->
-    {req, [{local_slave_nodes, 1}, {time, 10}]};
-primary_archive(doc) ->
-    ["Read files from primary archive."];
+%% Read files from primary archive.
 primary_archive(Config) when is_list(Config) ->
     %% Copy the orig files to priv_dir
     PrivDir = proplists:get_value(priv_dir, Config),
@@ -512,10 +499,7 @@ create_archive(Archive, AppDirs) ->
     zip:create(Archive, AppDirs, Opts).
 
 
-virtual_dir_in_archive(suite) ->
-    [];
-virtual_dir_in_archive(doc) ->
-    ["Read virtual directories from archive."];
+%% Read virtual directories from archive.
 virtual_dir_in_archive(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     Data = <<"A little piece of data.">>,
diff --git a/lib/kernel/test/error_logger_SUITE.erl b/lib/kernel/test/error_logger_SUITE.erl
index dcf13e0120..69e15125a2 100644
--- a/lib/kernel/test/error_logger_SUITE.erl
+++ b/lib/kernel/test/error_logger_SUITE.erl
@@ -66,8 +66,6 @@ end_per_group(_GroupName, Config) ->
 
 %%-----------------------------------------------------------------
 
-error_report(suite) -> [];
-error_report(doc) -> [];
 error_report(Config) when is_list(Config) ->
     ?line error_logger:add_report_handler(?MODULE, self()),
     Rep1 = [{tag1,"data1"},{tag2,data2},{tag3,3}],
@@ -106,8 +104,6 @@ error_report(Config) when is_list(Config) ->
 
 %%-----------------------------------------------------------------
 
-info_report(suite) -> [];
-info_report(doc) -> [];
 info_report(Config) when is_list(Config) ->
     ?line error_logger:add_report_handler(?MODULE, self()),
     Rep1 = [{tag1,"data1"},{tag2,data2},{tag3,3}],
@@ -146,8 +142,6 @@ info_report(Config) when is_list(Config) ->
 
 %%-----------------------------------------------------------------
 
-error(suite) -> [];
-error(doc) -> [];
 error(Config) when is_list(Config) ->
     ?line error_logger:add_report_handler(?MODULE, self()),
     Msg1 = "This is a plain text string~n",
@@ -181,8 +175,6 @@ error(Config) when is_list(Config) ->
 
 %%-----------------------------------------------------------------
 
-info(suite) -> [];
-info(doc) -> [];
 info(Config) when is_list(Config) ->
     ?line error_logger:add_report_handler(?MODULE, self()),
     Msg1 = "This is a plain text string~n",
@@ -209,8 +201,6 @@ info(Config) when is_list(Config) ->
 
 %%-----------------------------------------------------------------
 
-emulator(suite) -> [];
-emulator(doc) -> [];
 emulator(Config) when is_list(Config) ->
     ?line error_logger:add_report_handler(?MODULE, self()),
     Msg = "Error in process ~p on node ~p with exit value:~n~p~n",
@@ -229,8 +219,6 @@ generate_error(Error, Stack) ->
 %% want to interact with the test run.
 %%-----------------------------------------------------------------
 
-tty(suite) -> [];
-tty(doc) -> [];
 tty(Config) when is_list(Config) ->
     ?line {'EXIT', _Reason} = (catch error_logger:tty(dummy)),
     ok.
@@ -239,8 +227,6 @@ tty(Config) when is_list(Config) ->
 %% If where already exists a logfile we skip this test case !!
 %%-----------------------------------------------------------------
 
-logfile(suite) -> [];
-logfile(doc) -> [];
 logfile(Config) when is_list(Config) ->
     ?line case error_logger:logfile(filename) of
 	      {error, no_log_file} -> % Ok, we continues.
@@ -260,8 +246,6 @@ do_logfile() ->
 
 %%-----------------------------------------------------------------
 
-add(suite) -> [];
-add(doc) -> [];
 add(Config) when is_list(Config) ->
     ?line {'EXIT',_} = (catch error_logger:add_report_handler("dummy")),
     ?line {'EXIT',_} = error_logger:add_report_handler(non_existing),
@@ -270,8 +254,6 @@ add(Config) when is_list(Config) ->
 
 %%-----------------------------------------------------------------
 
-delete(suite) -> [];
-delete(doc) -> [];
 delete(Config) when is_list(Config) ->
     ?line {'EXIT',_} = (catch error_logger:delete_report_handler("dummy")),
     ?line {error,_} = error_logger:delete_report_handler(non_existing),
diff --git a/lib/kernel/test/error_logger_warn_SUITE.erl b/lib/kernel/test/error_logger_warn_SUITE.erl
index 544789d90c..6b5263a3f8 100644
--- a/lib/kernel/test/error_logger_warn_SUITE.erl
+++ b/lib/kernel/test/error_logger_warn_SUITE.erl
@@ -74,56 +74,47 @@ init_per_testcase(_Case, Config) ->
 end_per_testcase(_Case, _Config) ->
     ok.
 
-basic(doc) ->
-    ["Tests basic error logger functionality"];
+%% Tests basic error logger functionality.
 basic(Config) when is_list(Config) ->
     put(elw_config,Config),
     basic().
 
-warnings_info(doc) ->
-    ["Tests mapping warnings to info functionality"];
+%% Tests mapping warnings to info functionality.
 warnings_info(Config) when is_list(Config) ->
     put(elw_config,Config),
     warnings_info().
 
-warnings_errors(doc) ->
-    ["Tests mapping warnings to errors functionality"];
+%% Tests mapping warnings to errors functionality.
 warnings_errors(Config) when is_list(Config) ->
     put(elw_config,Config),
     warnings_errors().
 
-rb_basic(doc) ->
-    ["Tests basic rb functionality"];
+%% Tests basic rb functionality.
 rb_basic(Config) when is_list(Config) ->
     put(elw_config,Config),
     rb_basic().
 
-rb_warnings_info(doc) ->
-    ["Tests warnings as info rb functionality"];
+%% Tests warnings as info rb functionality.
 rb_warnings_info(Config) when is_list(Config) ->
     put(elw_config,Config),
     rb_warnings_info().
 
-rb_warnings_errors(doc) ->
-    ["Tests warnings as errors rb functionality"];
+%% Tests warnings as errors rb functionality.
 rb_warnings_errors(Config) when is_list(Config) ->
     put(elw_config,Config),
     rb_warnings_errors().
 
-rb_trunc(doc) ->
-    ["Tests rb functionality on truncated data"];
+%% Tests rb functionality on truncated data.
 rb_trunc(Config) when is_list(Config) ->
     put(elw_config,Config),
     rb_trunc().
 
-rb_utc(doc) ->
-    ["Tests UTC mapping in rb (-sasl utc_log true)"];
+%% Tests UTC mapping in rb (-sasl utc_log true).
 rb_utc(Config) when is_list(Config) ->
     put(elw_config,Config),
     rb_utc().
 
-file_utc(doc) ->
-    ["Tests UTC mapping in file logger (-stdlib utc_log true)"];
+%% Tests UTC mapping in file logger (-stdlib utc_log true).
 file_utc(Config) when is_list(Config) ->
     put(elw_config,Config),
     file_utc().
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 0e3ff89ca7..ede911c55b 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -263,10 +263,7 @@ mini_server(Parent) ->
 	    mini_server(Parent)
     end.
 
-standard_io(suite) ->
-    [];
-standard_io(doc) ->
-    ["Test that standard i/o-servers work with file module"];
+%% Test that standard i/o-servers work with file module.
 standard_io(Config) when is_list(Config) ->
     %% Really just a smoke test
     ?line Pid = spawn(?MODULE,mini_server,[self()]),
@@ -323,10 +320,7 @@ standard_io(Config) when is_list(Config) ->
     Pid ! die,
     receive after 1000 -> ok end.
 
-old_io_protocol(suite) ->
-    [];
-old_io_protocol(doc) ->
-    ["Test that the old file IO protocol =< R16B still works"];
+%% Test that the old file IO protocol =< R16B still works.
 old_io_protocol(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     Name = filename:join(RootDir,
@@ -344,8 +338,6 @@ old_io_protocol(Config) when is_list(Config) ->
     [] = flush(),
     ok.
 
-unicode_mode(suite) -> [];
-unicode_mode(doc) -> [""];
 unicode_mode(Config) ->
     Dir = {dir, proplists:get_value(priv_dir,Config)},
     OptVariants = [[Dir],
@@ -493,8 +485,6 @@ um_filename(Str = [_|_], Dir, Options) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-read_write_file(suite) -> [];
-read_write_file(doc) -> [];
 read_write_file(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -551,8 +541,6 @@ read_write_file(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-make_del_dir(suite) -> [];
-make_del_dir(doc) -> [];
 make_del_dir(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line NewDir = filename:join(RootDir, 
@@ -614,8 +602,6 @@ make_del_dir(Config) when is_list(Config) ->
     end,
     ok.
 
-cur_dir_0(suite) -> [];
-cur_dir_0(doc) -> [];
 cur_dir_0(Config) when is_list(Config) ->
     %% Find out the current dir, and cd to it ;-)
     ?line {ok,BaseDir} = ?FILE_MODULE:get_cwd(),
@@ -680,8 +666,6 @@ cur_dir_0(Config) when is_list(Config) ->
 
 %% Tests ?FILE_MODULE:get_cwd/1.
 
-cur_dir_1(suite) -> [];
-cur_dir_1(doc) -> [];
 cur_dir_1(Config) when is_list(Config) ->
     ?line case os:type() of
 	   {win32, _} ->
@@ -854,8 +838,6 @@ start_node(Name, Args) ->
 
 
 
-open1(suite) -> [];
-open1(doc) -> [];
 open1(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line NewDir = filename:join(RootDir, 
@@ -883,8 +865,6 @@ open1(Config) when is_list(Config) ->
 
 %% Tests all open modes.
 
-old_modes(suite) -> [];
-old_modes(doc) -> [];
 old_modes(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
@@ -915,8 +895,6 @@ old_modes(Config) when is_list(Config) ->
     ok.
 
 
-new_modes(suite) -> [];
-new_modes(doc) -> [];
 new_modes(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
@@ -975,8 +953,6 @@ new_modes(Config) when is_list(Config) ->
     ?line [] = flush(),
     ok.
 
-path_open(suite) -> [];
-path_open(doc) -> [];
 path_open(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line NewDir = filename:join(RootDir, 
@@ -1018,8 +994,6 @@ path_open(Config) when is_list(Config) ->
     ?line [] = flush(),
     ok.
 
-close(suite) -> [];
-close(doc) -> [];
 close(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -1040,8 +1014,6 @@ close(Config) when is_list(Config) ->
     ?line [] = flush(),
     ok.
 
-access(suite) -> [];
-access(doc) -> [];
 access(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -1069,8 +1041,6 @@ access(Config) when is_list(Config) ->
 
 %% Tests ?FILE_MODULE:read/2 and ?FILE_MODULE:write/2.
 
-read_write(suite) -> [];
-read_write(doc) -> [];
 read_write(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
@@ -1116,8 +1086,6 @@ read_write_test(File, Marker, Empty) ->
 
 %% Tests ?FILE_MODULE:pread/2 and ?FILE_MODULE:pwrite/2.
 
-pread_write(suite) -> [];
-pread_write(doc) -> [];
 pread_write(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
@@ -1172,8 +1140,7 @@ pread_write_test(File, Data) ->
     ?line [] = flush(),
     ok.
 
-append(doc) -> "Test appending to a file.";
-append(suite) -> [];
+%% Test appending to a file.
 append(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
@@ -1204,8 +1171,6 @@ append(Config) when is_list(Config) ->
     ?line [] = flush(),
     ok.
 
-open_errors(suite) -> [];
-open_errors(doc) -> [];
 open_errors(Config) when is_list(Config) ->
     ?line DataDir = 
 	filename:dirname(
@@ -1220,8 +1185,7 @@ open_errors(Config) when is_list(Config) ->
     ?line [] = flush(),
     ok.
 
-exclusive(suite) -> [];
-exclusive(doc) -> "Test exclusive access to a file.";
+%% Test exclusive access to a file.
 exclusive(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line NewDir = filename:join(RootDir,
@@ -1237,8 +1201,6 @@ exclusive(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-pos1(suite) -> [];
-pos1(doc) -> [];
 pos1(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -1301,8 +1263,6 @@ pos1(Config) when is_list(Config) ->
     ?line [] = flush(),
     ok.
 
-pos2(suite) -> [];
-pos2(doc) -> [];
 pos2(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -1323,8 +1283,7 @@ pos2(Config) when is_list(Config) ->
     ?line io:format("DONE"),
     ok.
 
-pos3(suite) -> [];
-pos3(doc) -> ["When it does not use raw mode, file:position had a bug."];
+%% When it does not use raw mode, file:position had a bug.
 pos3(Config) when is_list(Config) ->
     RootDir = proplists:get_value(data_dir, Config),
     ?line Name = filename:join(RootDir, "realmen.html.gz"),
@@ -1343,8 +1302,6 @@ pos3(Config) when is_list(Config) ->
 
     ok.
 
-file_info_basic_file(suite) -> [];
-file_info_basic_file(doc) -> [];
 file_info_basic_file(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
 
@@ -1374,8 +1331,6 @@ file_info_basic_file(Config) when is_list(Config) ->
     ?line [] = flush(),
     ok.
 
-file_info_basic_directory(suite) -> [];
-file_info_basic_directory(doc) -> [];
 file_info_basic_directory(Config) when is_list(Config) ->
     %% Note: filename:join/1 removes any trailing slash,
     %% which is essential for ?FILE_MODULE:file_info/1 to work on
@@ -1423,8 +1378,6 @@ all_integers([]) -> ok.
 
 %% Try something nonexistent.
 
-file_info_bad(suite) -> [];
-file_info_bad(doc) -> [];
 file_info_bad(Config) when is_list(Config) ->
     RootDir = filename:join([proplists:get_value(priv_dir, Config)]),
     FileName = filename:join(RootDir, atom_to_list(?MODULE) ++ "_nonexistent"),
@@ -1437,8 +1390,6 @@ file_info_bad(Config) when is_list(Config) ->
 
 %% Test that the file times behave as they should.
 
-file_info_times(suite) -> [];
-file_info_times(doc) -> [];
 file_info_times(Config) when is_list(Config) ->
     %% We have to try this twice, since if the test runs across the change
     %% of a month the time diff calculations will fail. But it won't happen
@@ -1531,8 +1482,6 @@ filter_atime(Atime, Config) ->
 
 %% Test the write_file_info/2 function.
 
-file_write_file_info(suite) -> [];
-file_write_file_info(doc) -> [];
 file_write_file_info(Config) when is_list(Config) ->
     ?line RootDir = get_good_directory(Config),
     io:format("RootDir = ~p", [RootDir]),
@@ -1613,8 +1562,6 @@ get_good_directory(Config) ->
     proplists:get_value(priv_dir, Config).
 
 
-consult1(suite) -> [];
-consult1(doc) -> [];
 consult1(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -1642,8 +1589,6 @@ consult1(Config) when is_list(Config) ->
     ?line [] = flush(),
     ok.
 
-path_consult(suite) -> [];
-path_consult(doc) -> [];
 path_consult(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line FileName = atom_to_list(?MODULE)++"_path_consult.fil",
@@ -1669,8 +1614,6 @@ path_consult(Config) when is_list(Config) ->
     ok.
 
 
-eval1(suite) -> [];
-eval1(doc) -> [];
 eval1(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -1703,8 +1646,6 @@ eval1(Config) when is_list(Config) ->
     ?line [] = flush(),
     ok.
 
-path_eval(suite) -> [];
-path_eval(doc) -> [];
 path_eval(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line FileName = atom_to_list(?MODULE)++"_path_eval.fil",
@@ -1737,8 +1678,6 @@ path_eval(Config) when is_list(Config) ->
     ok.
 
 
-script1(suite) -> [];
-script1(doc) -> "";
 script1(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -1768,8 +1707,6 @@ script1(Config) when is_list(Config) ->
     ?line [] = flush(),
     ok.
     
-path_script(suite) -> [];
-path_script(doc) -> [];
 path_script(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line FileName = atom_to_list(?MODULE)++"_path_script.fil",
@@ -1803,8 +1740,6 @@ path_script(Config) when is_list(Config) ->
 
     
 
-truncate(suite) -> [];
-truncate(doc) -> [];
 truncate(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -1835,8 +1770,7 @@ truncate(Config) when is_list(Config) ->
     ok.
 
 
-datasync(suite) -> [];
-datasync(doc) -> "Tests that ?FILE_MODULE:datasync/1 at least doesn't crash.";
+%% Tests that ?FILE_MODULE:datasync/1 at least doesn't crash.
 datasync(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     ?line Sync = filename:join(PrivDir,
@@ -1857,8 +1791,7 @@ datasync(Config) when is_list(Config) ->
     ok.
 
 
-sync(suite) -> [];
-sync(doc) -> "Tests that ?FILE_MODULE:sync/1 at least doesn't crash.";
+%% Tests that ?FILE_MODULE:sync/1 at least doesn't crash.
 sync(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     ?line Sync = filename:join(PrivDir, 
@@ -1878,8 +1811,7 @@ sync(Config) when is_list(Config) ->
     ?line [] = flush(),
     ok.
 
-advise(suite) -> [];
-advise(doc) -> "Tests that ?FILE_MODULE:advise/4 at least doesn't crash.";
+%% Tests that ?FILE_MODULE:advise/4 at least doesn't crash.
 advise(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     ?line Advise = filename:join(PrivDir,
@@ -1947,8 +1879,7 @@ advise(Config) when is_list(Config) ->
     ?line [] = flush(),
     ok.
 
-allocate(suite) -> [];
-allocate(doc) -> "Tests that ?FILE_MODULE:allocate/3 at least doesn't crash.";
+%% Tests that ?FILE_MODULE:allocate/3 at least doesn't crash.
 allocate(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     ?line Allocate = filename:join(PrivDir,
@@ -2016,8 +1947,6 @@ allocate_and_assert(Fd, Offset, Length) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-delete(suite) -> [];
-delete(doc) -> [];
 delete(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -2037,8 +1966,6 @@ delete(Config) when is_list(Config) ->
     ?line [] = flush(),
     ok.
 
-rename(suite) ->[];
-rename(doc) ->[];
 rename(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line FileName1 = atom_to_list(?MODULE)++"_rename.fil",
@@ -2091,8 +2018,6 @@ rename(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-names(suite) -> [];
-names(doc) -> [];
 names(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line FileName = "foo1.fil",
@@ -2144,8 +2069,6 @@ names(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-e_delete(suite) -> [];
-e_delete(doc) -> [];
 e_delete(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line Base = filename:join(RootDir, 
@@ -2188,8 +2111,6 @@ e_delete(Config) when is_list(Config) ->
 %%% (What about FreeBSD? We store our nightly build results on a FreeBSD
 %%% file system, that's what.)
 
-e_rename(suite) -> [];
-e_rename(doc) -> [];
 e_rename(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     Base = filename:join(RootDir,
@@ -2284,8 +2205,6 @@ e_rename(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-e_make_dir(suite) -> [];
-e_make_dir(doc) -> [];
 e_make_dir(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     Base = filename:join(RootDir, 
@@ -2318,8 +2237,6 @@ e_make_dir(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-e_del_dir(suite) -> [];
-e_del_dir(doc) -> [];
 e_del_dir(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     Base = test_server:temp_name(filename:join(RootDir, "e_del_dir")),
@@ -2508,8 +2425,6 @@ read_cooked_tar_problem(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-write_compressed(suite) -> [];
-write_compressed(doc) -> [];
 write_compressed(Config) when is_list(Config) ->
     Priv = proplists:get_value(priv_dir, Config),
     ?line MyFile = filename:join(Priv, 
@@ -2587,8 +2502,6 @@ catenated_gzips(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-compress_errors(suite) -> [];
-compress_errors(doc) -> [];
 compress_errors(Config) when is_list(Config) ->
     ?line DataDir = 
 	filename:dirname(
@@ -2620,8 +2533,6 @@ compress_errors(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-compress_async_crash(suite) -> [];
-compress_async_crash(doc) -> [];
 compress_async_crash(Config) when is_list(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
     ?line Path = filename:join(DataDir, "test.gz"),
@@ -2705,10 +2616,7 @@ unicode(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-altname(doc) ->
-    "Test the file:altname/1 function";
-altname(suite) ->
-    [];
+%% Test the file:altname/1 function.
 altname(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
@@ -2735,8 +2643,7 @@ altname(Config) when is_list(Config) ->
     Result.
 
 
-make_link(doc) -> "Test creating a hard link.";
-make_link(suite) -> [];
+%% Test creating a hard link.
 make_link(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
@@ -2772,10 +2679,8 @@ make_link(Config) when is_list(Config) ->
     ?line [] = flush(),
     Result.
 
-read_link_info_for_non_link(doc) ->
-    "Test that reading link info for an ordinary file or directory works "
-	"(on all platforms).";
-read_link_info_for_non_link(suite) -> [];
+%% Test that reading link info for an ordinary file or directory works
+%% (on all platforms).
 read_link_info_for_non_link(Config) when is_list(Config) ->
     ?line {ok, #file_info{type=directory}} = 
 	?FILE_MODULE:read_link_info("."),
@@ -2784,8 +2689,7 @@ read_link_info_for_non_link(Config) when is_list(Config) ->
     ?line [] = flush(),
     ok.
 
-symlinks(doc) -> "Test operations on symbolic links (for Unix).";
-symlinks(suite) -> [];
+%% Test operations on symbolic links (for Unix).
 symlinks(Config) when is_list(Config) ->
     ?line {error, _} = ?FILE_MODULE:read_link(lists:duplicate(10000,$a)),
     {error, _} = ?FILE_MODULE:read_link_all(lists:duplicate(10000,$a)),
@@ -2830,8 +2734,6 @@ symlinks(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-copy(doc) -> [];
-copy(suite) -> [];
 copy(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     %% Create a text file.
@@ -2995,10 +2897,7 @@ run_test(Test, Args) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-delayed_write(suite) ->
-    [];
-delayed_write(doc) ->
-    ["Tests the file open option {delayed_write, Size, Delay}"];
+%% Tests the file open option {delayed_write, Size, Delay}.
 
 delayed_write(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
@@ -3117,8 +3016,7 @@ delayed_write(Config) when is_list(Config) ->
     ok.
 
 
-pid2name(doc) -> "Tests file:pid2name/1.";
-pid2name(suite) -> [];
+%% Tests file:pid2name/1.
 pid2name(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line Base = test_server:temp_name(
@@ -3138,10 +3036,7 @@ pid2name(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-read_ahead(suite) ->
-    [];
-read_ahead(doc) ->
-    ["Tests the file open option {read_ahead, Size}"];
+%% Tests the file open option {read_ahead, Size}.
 
 read_ahead(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
@@ -3202,10 +3097,7 @@ read_ahead(Config) when is_list(Config) ->
 
 
 
-segment_read(suite) ->
-    [];
-segment_read(doc) ->
-    ["Tests the segmenting of large reads"];
+%% Tests the segmenting of large reads.
 segment_read(Config) when is_list(Config) ->
     Name = filename:join(proplists:get_value(priv_dir, Config),
 			       ?MODULE_STRING ++ "_segment_read"),
@@ -3338,10 +3230,7 @@ segment_read(Config) when is_list(Config) ->
 
 
 
-segment_write(suite) ->
-    [];
-segment_write(doc) ->
-    ["Tests the segmenting of large writes"];
+%% Tests the segmenting of large writes.
 segment_write(Config) when is_list(Config) ->
     Name = filename:join(proplists:get_value(priv_dir, Config),
 			       ?MODULE_STRING ++ "_segment_write"),
@@ -3526,10 +3415,7 @@ segment_write(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-ipread(suite) ->
-    [];
-ipread(doc) ->
-    ["Test Dets special indirect pread"];
+%% Test Dets special indirect pread.
 ipread(Config) when is_list(Config) ->
     Dir = proplists:get_value(priv_dir, Config),
     ?line ok = ipread_int(Dir, [raw, binary]),
@@ -3623,10 +3509,7 @@ ipread_int(Dir, ModeList) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-interleaved_read_write(suite) ->
-    [];
-interleaved_read_write(doc) ->
-    ["Tests interleaved read and writes"];
+%% Tests interleaved read and writes.
 interleaved_read_write(Config) when is_list(Config) ->
     Dir = proplists:get_value(priv_dir, Config),
     ?line File = 
@@ -3652,10 +3535,7 @@ interleaved_read_write(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-otp_5814(suite) ->
-    [];
-otp_5814(doc) ->
-    ["OTP-5814. eval/consult/script return correct line numbers"];
+%% OTP-5814. eval/consult/script return correct line numbers.
 otp_5814(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     File = filename:join(PrivDir, "otp_5814"),
@@ -3690,10 +3570,7 @@ otp_5814(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-otp_10852(suite) ->
-    [];
-otp_10852(doc) ->
-    ["OTP-10852. +fnu and latin1 filenames"];
+%% OTP-10852. +fnu and latin1 filenames.
 otp_10852(Config) when is_list(Config) ->
     Node = start_node(erl_pp_helper, "+fnu"),
     Dir = proplists:get_value(priv_dir, Config),
@@ -3740,10 +3617,7 @@ rpc_call(N, F, As) ->
 large_file() ->
     [{timetrap,{minutes,20}}].
 
-large_file(suite) ->
-    [];
-large_file(doc) ->
-    ["Tests positioning in large files (> 4G)"];
+%% Tests positioning in large files (> 4G).
 large_file(Config) when is_list(Config) ->
     run_large_file_test(Config,
 			fun(Name) -> do_large_file(Name) end,
@@ -4049,10 +3923,7 @@ read_line_create_files(TestData) ->
 read_line_remove_files(TestData) ->
     [ file:delete(File) || {_Function,File,_,_} <- TestData ].
 
-read_line_1(suite) -> 
-    [];
-read_line_1(doc) ->
-    ["read_line with prim_file"];
+%% read_line with prim_file.
 read_line_1(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     ?line All = read_line_testdata(PrivDir),
@@ -4074,10 +3945,7 @@ read_line_1(Config) when is_list(Config) ->
 	    end || {_,File,_,Y} <- All , Y =:= fail],
     ?line read_line_remove_files(All),
     ok.
-read_line_2(suite) -> 
-    [];
-read_line_2(doc) ->
-    ["read_line with file"];
+%% read_line with file.
 read_line_2(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     ?line All = read_line_testdata(PrivDir),
@@ -4099,10 +3967,7 @@ read_line_2(Config) when is_list(Config) ->
 	    end || {_,File,_,Y} <- All , Y =:= fail],
     ?line read_line_remove_files(All),
     ok.
-read_line_3(suite) -> 
-    [];
-read_line_3(doc) ->
-    ["read_line with raw file"];
+%% read_line with raw file.
 read_line_3(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     ?line All = read_line_testdata(PrivDir),
@@ -4124,10 +3989,7 @@ read_line_3(Config) when is_list(Config) ->
 	    end || {_,File,_,Y} <- All , Y =:= fail],
     ?line read_line_remove_files(All),
     ok.
-read_line_4(suite) -> 
-    [];
-read_line_4(doc) ->
-    ["read_line with raw buffered file"];
+%% read_line with raw buffered file.
 read_line_4(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     ?line All = read_line_testdata(PrivDir),
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl
index ccdc1116e0..b3ebc48856 100644
--- a/lib/kernel/test/file_name_SUITE.erl
+++ b/lib/kernel/test/file_name_SUITE.erl
@@ -106,10 +106,7 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
 	Config.
 
-home_dir(suite) ->
-    [];
-home_dir(doc) ->
-    ["Check that Erlang can be started with unicode named home directory"];
+%% Check that Erlang can be started with unicode named home directory.
 home_dir(Config) when is_list(Config) ->
     try
 	Name=[960,945,964,961,953,954],
@@ -154,10 +151,7 @@ home_dir(Config) when is_list(Config) ->
 	    {skipped,"Runs only on Unix/Windows"}
     end.
 
-normalize(suite) ->
-    [];
-normalize(doc) ->
-    ["Check that filename normalization works"];
+%% Check that filename normalization works.
 normalize(Config) when is_list(Config) ->
     rand:seed(exsplus, {1290,431421,830412}),
     try
@@ -185,10 +179,7 @@ normalize(Config) when is_list(Config) ->
 	    {skipped,"VM needs to be started in Unicode filename mode"}
     end.
     
-normal(suite) ->
-    [];
-normal(doc) ->
-    "Check file operations on normal file names regardless of unicode mode";
+%% Check file operations on normal file names regardless of unicode mode.
 normal(Config) when is_list(Config) ->
     {ok,Dir} = file:get_cwd(),
     try
@@ -206,10 +197,7 @@ normal(Config) when is_list(Config) ->
     end.
     
 
-icky(suite) ->
-    [];
-icky(doc) ->
-    "Check file operations on normal file names regardless of unicode mode";
+%% Check file operations on normal file names regardless of unicode mode.
 icky(Config) when is_list(Config) ->
     case hopeless_darwin() of
 	true ->
@@ -230,10 +218,7 @@ icky(Config) when is_list(Config) ->
 		file:set_cwd(Dir)
 	    end
     end.
-very_icky(suite) ->
-    [];
-very_icky(doc) ->
-    "Check file operations on normal file names regardless of unicode mode";
+%% Check file operations on normal file names regardless of unicode mode.
 very_icky(Config) when is_list(Config) ->
     case hopeless_darwin() of
 	true ->
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index 2bd1e63804..338319a870 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -93,19 +93,13 @@ end_per_testcase(_Func, _Config) ->
 
 
 
-basic(doc) ->
-    "Hello world";
-basic(suite) ->
-    [];
+%% Hello world.
 basic(Config) when is_list(Config) ->
     ?line {ok,S} = gen_sctp:open(),
     ?line ok = gen_sctp:close(S),
     ok.
 
-xfer_min(doc) ->
-    "Minimal data transfer";
-xfer_min(suite) ->
-    [];
+%% Minimal data transfer.
 xfer_min(Config) when is_list(Config) ->
     ?line Stream = 0,
     ?line Data = <<"The quick brown fox jumps over a lazy dog 0123456789">>,
@@ -213,10 +207,7 @@ xfer_min(Config) when is_list(Config) ->
 	  end,
     ok.
 
-xfer_active(doc) ->
-    "Minimal data transfer in active mode";
-xfer_active(suite) ->
-    [];
+%% Minimal data transfer in active mode.
 xfer_active(Config) when is_list(Config) ->
     ?line Timeout = 2000,
     ?line Stream = 0,
@@ -346,11 +337,8 @@ recv_paddr_change(S, Addr, Port, Timeout) ->
 	    timeout
     end.
 
-def_sndrcvinfo(doc) ->
-    "Test that #sctp_sndrcvinfo{} parameters set on a socket "
-	"are used by gen_sctp:send/4";
-def_sndrcvinfo(suite) ->
-    [];
+%% Test that #sctp_sndrcvinfo{} parameters set on a socket
+%% are used by gen_sctp:send/4.
 def_sndrcvinfo(Config) when is_list(Config) ->
     ?line Loopback = {127,0,0,1},
     ?line Data = <<"What goes up, must come down.">>,
@@ -541,10 +529,7 @@ flush() ->
 	    []
     end.
 
-api_open_close(doc) ->
-    "Test the API function open/1,2 and close/1";
-api_open_close(suite) ->
-    [];
+%% Test the API function open/1,2 and close/1.
 api_open_close(Config) when is_list(Config) ->
     ?line {ok,S1} = gen_sctp:open(0),
     ?line {ok,P}  = inet:port(S1),
@@ -605,10 +590,7 @@ api_open_close(Config) when is_list(Config) ->
 	  end,
     ok.
 
-api_listen(doc) ->
-    "Test the API function listen/2";
-api_listen(suite) ->
-    [];
+%% Test the API function listen/2.
 api_listen(Config) when is_list(Config) ->
     ?line Localhost = {127,0,0,1},
 
@@ -646,10 +628,7 @@ api_listen(Config) when is_list(Config) ->
     ?line ok = gen_sctp:close(Sb),
     ok.
 
-api_connect_init(doc) ->
-    "Test the API function connect_init/4";
-api_connect_init(suite) ->
-    [];
+%% Test the API function connect_init/4.
 api_connect_init(Config) when is_list(Config) ->
     ?line Localhost = {127,0,0,1},
 
@@ -703,10 +682,7 @@ recv_event({Addr,Port,
 	    #sctp_shutdown_event{assoc_id=Assoc}=ShutdownEvent}) ->
     {Addr,Port,ShutdownEvent}.
 
-api_opts(doc) ->
-    "Test socket options";
-api_opts(suite) ->
-    [];
+%% Test socket options.
 api_opts(Config) when is_list(Config) ->
     ?line Sndbuf = 32768,
     ?line Recbuf = 65536,
@@ -787,10 +763,7 @@ implicit_inet6(S1, Addr) ->
 	  end,
     ?line ok = gen_sctp:close(S2).
 
-active_n(doc) ->
-    "Verify {active,N} socket management";
-active_n(suite) ->
-    [];
+%% Verify {active,N} socket management.
 active_n(Config) when is_list(Config) ->
     N = 3,
     S1 = ok(gen_sctp:open([{active,N}])),
@@ -887,10 +860,7 @@ active_n(Config) when is_list(Config) ->
     ok = gen_sctp:close(S1),
     ok.
 
-basic_stream(doc) ->
-    "Hello world stream socket";
-basic_stream(suite) ->
-    [];
+%% Hello world stream socket.
 basic_stream(Config) when is_list(Config) ->
     ?line {ok,S} = gen_sctp:open([{type,stream}]),
     ?line ok = gen_sctp:listen(S, true),
@@ -900,10 +870,7 @@ basic_stream(Config) when is_list(Config) ->
     ?line ok = gen_sctp:close(S),
     ok.
 
-xfer_stream_min(doc) ->
-    "Minimal data transfer";
-xfer_stream_min(suite) ->
-    [];
+%% Minimal data transfer.
 xfer_stream_min(Config) when is_list(Config) ->
     ?line Stream = 0,
     ?line Data = <<"The quick brown fox jumps over a lazy dog 0123456789">>,
@@ -1058,26 +1025,17 @@ do_from_other_process(Fun) ->
     end.
 
 
-peeloff_active_once(doc) ->
-    "Peel off an SCTP stream socket ({active,once})";
-peeloff_active_once(suite) ->
-    [];
+%% Peel off an SCTP stream socket ({active,once}).
 
 peeloff_active_once(Config) ->
     peeloff(Config, [{active,once}]).
 
-peeloff_active_true(doc) ->
-    "Peel off an SCTP stream socket ({active,true})";
-peeloff_active_true(suite) ->
-    [];
+%% Peel off an SCTP stream socket ({active,true}).
 
 peeloff_active_true(Config) ->
     peeloff(Config, [{active,true}]).
 
-peeloff_active_n(doc) ->
-    "Peel off an SCTP stream socket ({active,N})";
-peeloff_active_n(suite) ->
-    [];
+%% Peel off an SCTP stream socket ({active,N}).
 
 peeloff_active_n(Config) ->
     peeloff(Config, [{active,1}]).
@@ -1187,10 +1145,7 @@ peeloff(Config, SockOpts) when is_list(Config) ->
 
 
 
-buffers(doc) ->
-    ["Check sndbuf and recbuf behaviour"];
-buffers(suite) ->
-    [];
+%% Check sndbuf and recbuf behaviour.
 buffers(Config) when is_list(Config) ->
     ?line Limit = 4096,
     ?line Addr = {127,0,0,1},
@@ -1269,10 +1224,7 @@ mk_data(_, _, Bin) ->
 
 
 
-open_multihoming_ipv4_socket(doc) ->
-    "Test opening a multihoming ipv4 socket";
-open_multihoming_ipv4_socket(suite) ->
-    [];
+%% Test opening a multihoming ipv4 socket.
 open_multihoming_ipv4_socket(Config) when is_list(Config) ->
     ?line case get_addrs_by_family(inet, 2) of
 	      {ok, [Addr1, Addr2]} ->
@@ -1281,12 +1233,9 @@ open_multihoming_ipv4_socket(Config) when is_list(Config) ->
 		  {skip, Reason}
 	  end.
 
-open_unihoming_ipv6_socket(doc) ->
-    %% This test is mostly aimed to indicate
-    %% whether host has a non-working ipv6 setup
-    "Test opening a unihoming (non-multihoming) ipv6 socket";
-open_unihoming_ipv6_socket(suite) ->
-    [];
+%% This test is mostly aimed to indicate whether host has a
+%% non-working ipv6 setup.  Test opening a unihoming (non-multihoming)
+%% ipv6 socket.
 open_unihoming_ipv6_socket(Config) when is_list(Config) ->
     ?line case get_addrs_by_family(inet6, 1) of
 	      {ok, [Addr]} ->
@@ -1296,10 +1245,7 @@ open_unihoming_ipv6_socket(Config) when is_list(Config) ->
 	  end.
 
 
-open_multihoming_ipv6_socket(doc) ->
-    "Test opening a multihoming ipv6 socket";
-open_multihoming_ipv6_socket(suite) ->
-    [];
+%% Test opening a multihoming ipv6 socket.
 open_multihoming_ipv6_socket(Config) when is_list(Config) ->
     ?line case get_addrs_by_family(inet6, 2) of
 	      {ok, [Addr1, Addr2]} ->
@@ -1308,10 +1254,7 @@ open_multihoming_ipv6_socket(Config) when is_list(Config) ->
 		  {skip, Reason}
 	  end.
 
-open_multihoming_ipv4_and_ipv6_socket(doc) ->
-    "Test opening a multihoming ipv6 socket with ipv4 and ipv6 addresses";
-open_multihoming_ipv4_and_ipv6_socket(suite) ->
-    [];
+%% Test opening a multihoming ipv6 socket with ipv4 and ipv6 addresses.
 open_multihoming_ipv4_and_ipv6_socket(Config) when is_list(Config) ->
     ?line case get_addrs_by_family(inet_and_inet6, 2) of
 	      {ok, [[InetAddr1, InetAddr2], [Inet6Addr1, Inet6Addr2]]} ->
@@ -1331,31 +1274,19 @@ open_multihoming_ipv4_and_ipv6_socket(Config) when is_list(Config) ->
 		  {skip, Reason}
 	  end.
 
-names_unihoming_ipv4(doc) ->
-    "Test inet:socknames/peernames on unihoming IPv4 sockets";
-names_unihoming_ipv4(suite) ->
-    [];
+%% Test inet:socknames/peernames on unihoming IPv4 sockets.
 names_unihoming_ipv4(Config) when is_list(Config) ->
     ?line do_names(Config, inet, 1).
 
-names_unihoming_ipv6(doc) ->
-    "Test inet:socknames/peernames on unihoming IPv6 sockets";
-names_unihoming_ipv6(suite) ->
-    [];
+%% Test inet:socknames/peernames on unihoming IPv6 sockets.
 names_unihoming_ipv6(Config) when is_list(Config) ->
     ?line do_names(Config, inet6, 1).
 
-names_multihoming_ipv4(doc) ->
-    "Test inet:socknames/peernames on multihoming IPv4 sockets";
-names_multihoming_ipv4(suite) ->
-    [];
+%% Test inet:socknames/peernames on multihoming IPv4 sockets.
 names_multihoming_ipv4(Config) when is_list(Config) ->
     ?line do_names(Config, inet, 2).
 
-names_multihoming_ipv6(doc) ->
-    "Test inet:socknames/peernames on multihoming IPv6 sockets";
-names_multihoming_ipv6(suite) ->
-    [];
+%% Test inet:socknames/peernames on multihoming IPv6 sockets.
 names_multihoming_ipv6(Config) when is_list(Config) ->
     ?line do_names(Config, inet6, 2).
 
diff --git a/lib/kernel/test/gen_tcp_api_SUITE.erl b/lib/kernel/test/gen_tcp_api_SUITE.erl
index 77124c7e58..6aa4388f7a 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_api_SUITE.erl
@@ -75,8 +75,7 @@ end_per_testcase(_Func, _Config) ->
 %%% gen_tcp:accept/1,2
 
 
-t_accept_timeout(doc) -> "Test that gen_tcp:accept/2 (with timeout) works.";
-t_accept_timeout(suite) -> [];
+%% Test that gen_tcp:accept/2 (with timeout) works.
 t_accept_timeout(Config) when is_list(Config) ->
     ?line {ok, L} = gen_tcp:listen(0, []),
     ?line timeout({gen_tcp, accept, [L, 200]}, 0.2, 1.0).
@@ -84,7 +83,7 @@ t_accept_timeout(Config) when is_list(Config) ->
 %%% gen_tcp:connect/X
 
 
-t_connect_timeout(doc) -> "Test that gen_tcp:connect/4 (with timeout) works.";
+%% Test that gen_tcp:connect/4 (with timeout) works.
 t_connect_timeout(Config) when is_list(Config) ->
     %%?line BadAddr = {134,138,177,16},
     %%?line TcpPort = 80,
@@ -93,10 +92,8 @@ t_connect_timeout(Config) when is_list(Config) ->
     ?line ok = io:format("Connecting to ~p, port ~p", [BadAddr, TcpPort]),
     ?line connect_timeout({gen_tcp,connect,[BadAddr,TcpPort,[],200]}, 0.2, 5.0).
 
-t_connect_bad(doc) ->
-    ["Test that gen_tcp:connect/3 handles non-existings hosts, and other ",
-     "invalid things."];
-t_connect_bad(suite) -> [];
+%% Test that gen_tcp:connect/3 handles non-existings hosts, and other
+%% invalid things.
 t_connect_bad(Config) when is_list(Config) ->
     ?line NonExistingPort = 45638,		% Not in use, I hope.
     ?line {error, Reason1} = gen_tcp:connect(localhost, NonExistingPort, []),
@@ -112,8 +109,7 @@ t_connect_bad(Config) when is_list(Config) ->
 %%% gen_tcp:recv/X
 
 
-t_recv_timeout(doc) -> "Test that gen_tcp:recv/3 (with timeout works).";
-t_recv_timeout(suite) -> [];
+%% Test that gen_tcp:recv/3 (with timeout works).
 t_recv_timeout(Config) when is_list(Config) ->
     ?line {ok, L} = gen_tcp:listen(0, []),
     ?line {ok, Port} = inet:port(L),
@@ -121,8 +117,7 @@ t_recv_timeout(Config) when is_list(Config) ->
     ?line {ok, _A} = gen_tcp:accept(L),
     ?line timeout({gen_tcp, recv, [Client, 0, 200]}, 0.2, 5.0).
 
-t_recv_eof(doc) -> "Test that end of file on a socket is reported correctly.";
-t_recv_eof(suite) -> [];
+%% Test that end of file on a socket is reported correctly.
 t_recv_eof(Config) when is_list(Config) ->
     ?line {ok, L} = gen_tcp:listen(0, []),
     ?line {ok, Port} = inet:port(L),
@@ -132,8 +127,7 @@ t_recv_eof(Config) when is_list(Config) ->
     ?line {error, closed} = gen_tcp:recv(Client, 0),
     ok.
 
-t_recv_delim(doc) -> "Test using message delimiter $X";
-t_recv_delim(suite) -> [];
+%% Test using message delimiter $X.
 t_recv_delim(Config) when is_list(Config) ->
     {ok, L} = gen_tcp:listen(0, []),
     {ok, Port} = inet:port(L),
diff --git a/lib/kernel/test/gen_tcp_echo_SUITE.erl b/lib/kernel/test/gen_tcp_echo_SUITE.erl
index e10a81e727..9e7970da4f 100644
--- a/lib/kernel/test/gen_tcp_echo_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_echo_SUITE.erl
@@ -66,83 +66,65 @@ init_per_testcase(_Func, Config) ->
 end_per_testcase(_Func, _Config) ->
     ok.
 
-active_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in active mode)."];
-active_echo(suite) -> [];
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in active mode).
 active_echo(Config) when is_list(Config) ->
     ?line echo_test([], fun active_echo/4, [{echo, fun echo_server/0}]).
 
-passive_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in passive mode)."];
-passive_echo(suite) -> [];
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in passive mode).
 passive_echo(Config) when is_list(Config) ->
     ?line echo_test([{active, false}], fun passive_echo/4,
 		    [{echo, fun echo_server/0}]).
 
-active_once_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in active once mode)."];
-active_once_echo(suite) -> [];
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in active once mode).
 active_once_echo(Config) when is_list(Config) ->
     ?line echo_test([{active, once}], fun active_once_echo/4,
 		    [{echo, fun echo_server/0}]).
 
-slow_active_echo(doc) ->
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in active mode). ",
-     "The echo server is a special one that delays between every character."];
-slow_active_echo(suite) -> [];
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in active mode).
+%% The echo server is a special one that delays between every character.
 slow_active_echo(Config) when is_list(Config) ->
     ?line echo_test([], fun active_echo/4, 
 		    [slow_echo, {echo, fun slow_echo_server/0}]).
 
-slow_passive_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to an echo server and receiving them again (socket in passive mode).",
-     "The echo server is a special one that delays between every character."];
-slow_passive_echo(suite) -> [];
+%% Test sending packets of various sizes and various packet types
+%% to an echo server and receiving them again (socket in passive mode).
+%% The echo server is a special one that delays between every character.
 slow_passive_echo(Config) when is_list(Config) ->
     ?line echo_test([{active, false}], fun passive_echo/4,
 		    [slow_echo, {echo, fun slow_echo_server/0}]).
 
-limit_active_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in active mode) "
-     "with packet_size limitation."];
-limit_active_echo(suite) -> [];
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in active mode)
+%% with packet_size limitation.
 limit_active_echo(Config) when is_list(Config) ->
     ?line echo_test([{packet_size, 10}], 
 		    fun active_echo/4, 
 		    [{packet_size, 10}, {echo, fun echo_server/0}]).
 
-limit_passive_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in passive mode) ",
-     "with packet_size limitation."];
-limit_passive_echo(suite) -> [];
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in passive mode)
+%% with packet_size limitation.
 limit_passive_echo(Config) when is_list(Config) ->
     ?line echo_test([{packet_size, 10},{active, false}], 
 		    fun passive_echo/4,
 		    [{packet_size, 10}, {echo, fun echo_server/0}]).
 
-large_limit_active_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in active mode) "
-     "with large packet_size limitation."];
-large_limit_active_echo(suite) -> [];
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in active mode)
+%% with large packet_size limitation.
 large_limit_active_echo(Config) when is_list(Config) ->
     ?line echo_test([{packet_size, 10}], 
 		    fun active_echo/4, 
 		    [{packet_size, (1 bsl 32)-1}, 
 		     {echo, fun echo_server/0}]).
 
-large_limit_passive_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in passive mode) ",
-     "with large packet_size limitation."];
-large_limit_passive_echo(suite) -> [];
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in passive mode)
+%% with large packet_size limitation.
 large_limit_passive_echo(Config) when is_list(Config) ->
     ?line echo_test([{packet_size, 10},{active, false}], 
 		    fun passive_echo/4,
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 97eb5f0b61..634dbb55af 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -113,11 +113,8 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-default_options(doc) ->
-    ["Tests kernel application variables inet_default_listen_options and "
-     "inet_default_connect_options"];
-default_options(suite) ->
-    [];
+%% Tests kernel application variables inet_default_listen_options and
+%% inet_default_connect_options.
 default_options(Config) when is_list(Config) ->
     %% First check the delay_send option
     {true,true,true}=do_delay_send_1(),
@@ -289,11 +286,9 @@ do_delay_send_7() ->
     gen_tcp:close(LS),
     {B1,B2,B3}.
 
-controlling_process(doc) ->
-    ["Open a listen port and change controlling_process for it",
-     "The result should be ok of done by the owner process,"
-     "Otherwise is should return {error,not_owner} or similar"];
-controlling_process(suite) -> [];
+%% Open a listen port and change controlling_process for it
+%% The result should be ok of done by the owner process,
+%% Otherwise is should return {error,not_owner} or similar.
 controlling_process(Config) when is_list(Config) ->
     {ok,S} = gen_tcp:listen(0,[]),
     Pid2 = spawn(?MODULE,not_owner,[S]),
@@ -322,9 +317,8 @@ not_owner(S) ->
 	    ok
     end.
 
-controlling_process_self(doc) ->
-    ["Open a listen port and assign the controlling process to "
-     "it self, then exit and make sure the port is closed properly."];
+%% Open a listen port and assign the controlling process to
+%% it self, then exit and make sure the port is closed properly.
 controlling_process_self(Config) when is_list(Config) ->
     S = self(),
     process_flag(trap_exit,true),
@@ -348,11 +342,9 @@ controlling_process_self(Config) when is_list(Config) ->
     end.
     
 
-no_accept(doc) ->
-    ["Open a listen port and connect to it, then close the listen port ",
-     "without doing any accept.  The connected socket should receive ",
-     "a tcp_closed message."];
-no_accept(suite) -> [];
+%% Open a listen port and connect to it, then close the listen port
+%% without doing any accept.  The connected socket should receive
+%% a tcp_closed message.
 no_accept(Config) when is_list(Config) ->
     {ok, L} = gen_tcp:listen(0, []),
     {ok, {_, Port}} = inet:sockname(L),
@@ -366,10 +358,8 @@ no_accept(Config) when is_list(Config) ->
     
     end.
 
-close_with_pending_output(doc) ->
-    ["Send several packets to a socket and close it.  All packets should arrive ",
-     "to the other end."];
-close_with_pending_output(suite) -> [];
+%% Send several packets to a socket and close it.  All packets should
+%% arrive to the other end.
 close_with_pending_output(Config) when is_list(Config) ->
     {ok, L} = gen_tcp:listen(0, [binary, {active, false}]),
     {ok, {_, Port}} = inet:sockname(L),
@@ -412,9 +402,7 @@ send_loop(Sock, Data, Left) ->
     send_loop(Sock, Data, Left-1).
 
 %% Test {active,N} option
-active_n(doc) ->
-    ["Verify operation of the {active,N} option."];
-active_n(suite) -> [];
+%% Verify operation of the {active,N} option.
 active_n(Config) when is_list(Config) ->
     N = 3,
     LS = ok(gen_tcp:listen(0, [{active,N}])),
@@ -524,9 +512,7 @@ active_n(Config) when is_list(Config) ->
 %% I expect propagation of a close to be quite fast
 %% so 100 ms seems reasonable.
 
-otp_3924(doc) ->
-    ["Tests that a socket can be closed fast enough."];
-otp_3924(suite) -> [];
+%% Tests that a socket can be closed fast enough.
 otp_3924(Config) when is_list(Config) ->
     MaxDelay = (case has_superfluous_schedulers() of
 	    true -> 4;
@@ -653,8 +639,7 @@ otp_3924_sender(Receiver, Host, Port, Data) ->
     end.
 
 
-data_before_close(doc) ->
-    ["Tests that a huge amount of data can be received before a close."];
+%% Tests that a huge amount of data can be received before a close.
 data_before_close(Config) when is_list(Config) ->
     {ok, L} = gen_tcp:listen(0, [binary]),
     {ok, {_, TcpPort}} = inet:sockname(L),
@@ -691,11 +676,9 @@ make_zero_packet(N) when N rem 2 == 0 ->
 make_zero_packet(N) ->
     P = make_zero_packet(N div 2),
     [0, P|P].
-get_status(doc) ->    
-    ["OTP-2924",
-     "test that the socket process does not crash when sys:get_status(Pid)",
-     "is called."];
-get_status(suite) -> [];
+
+%% OTP-2924. Test that the socket process does not crash when
+%% sys:get_status(Pid) is called.
 get_status(Config) when is_list(Config) ->
     {ok,{socket,Pid,_,_}} = gen_tcp:listen(5678,[]),
     {status,Pid,_,_} = sys:get_status(Pid).
@@ -706,9 +689,8 @@ get_status(Config) when is_list(Config) ->
 iter_max_socks() ->
     [{timetrap,{minutes,30}}].
 
-iter_max_socks(doc) ->
-    ["Open as many sockets as possible. Do this several times and check ",
-     "that we get the same number of sockets every time."];
+%% Open as many sockets as possible. Do this several times and check
+%% that we get the same number of sockets every time.
 iter_max_socks(Config) when is_list(Config) ->
     N = case os:type() of {win32,_} -> 10; _ -> 20 end,
     %% Run on a different node in order to limit the effect if this test fails.
@@ -800,9 +782,8 @@ start_remote(Name) ->
     Pa = filename:dirname(code:which(?MODULE)),
     test_server:start_node(Name, slave, [{remote, true}, {args, "-pa " ++ Pa}]).
 
-passive_sockets(doc) ->
-    ["Tests that when 'the other side' on a passive socket closes, the connecting",
-     "side still can read until the end of data."];
+%% Tests that when 'the other side' on a passive socket closes, the
+%% connecting, side still can read until the end of data.
 passive_sockets(Config) when is_list(Config) ->
     spawn_link(?MODULE, passive_sockets_server,
                [[{active,false}],self()]),
@@ -867,9 +848,8 @@ passive_sockets_server_send(Socket, X) ->
     end.
 
 
-accept_closed_by_other_process(doc) ->
-    ["Tests the return value from gen_tcp:accept when ",
-     "the socket is closed from another process. (OTP-3817)"];
+%% Tests the return value from gen_tcp:accept when
+%% the socket is closed from another process. (OTP-3817)
 accept_closed_by_other_process(Config) when is_list(Config) ->
     Parent = self(),
     {ok, ListenSocket} = gen_tcp:listen(0, []),
@@ -897,10 +877,7 @@ repeat(_, _, _) ->
     ok.
 
 
-closed_socket(suite) ->
-    [];
-closed_socket(doc) ->
-    ["Tests the response when using a closed socket as argument"];
+%% Tests the response when using a closed socket as argument.
 closed_socket(Config) when is_list(Config) ->
     {ok, LS1} = gen_tcp:listen(0, []),
     erlang:yield(),
@@ -1904,10 +1881,7 @@ test_prio_udp() ->
     gen_udp:close(S),
     ok.
 
-so_priority(doc) ->
-    ["Tests the so_priority and ip_tos options on sockets when applicable."];
-so_priority(suite) ->
-    [];
+%% Tests the so_priority and ip_tos options on sockets when applicable.
 so_priority(Config) when is_list(Config) ->
     {ok,L} = gen_tcp:listen(0, [{active,false}]),
     ok = inet:setopts(L,[{priority,1}]),
@@ -1986,10 +1960,7 @@ mktmofun(Tmo,Parent,LS) ->
     fun() -> Parent ! {accepted,self(), catch gen_tcp:accept(LS,Tmo)} end.
 
 %% Accept tests
-primitive_accept(suite) ->
-    [];
-primitive_accept(doc) ->
-    ["Test singular accept"];
+%% Test singular accept.
 primitive_accept(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     {ok,PortNo}=inet:port(LS),
@@ -2007,10 +1978,7 @@ primitive_accept(Config) when is_list(Config) ->
     end.
 
 	
-multi_accept_close_listen(suite) ->
-    [];
-multi_accept_close_listen(doc) ->
-    ["Closing listen socket when multi-accepting"];
+%% Closing listen socket when multi-accepting.
 multi_accept_close_listen(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2023,10 +1991,7 @@ multi_accept_close_listen(Config) when is_list(Config) ->
     ok = ?EXPECT_ACCEPTS([{_,{error,closed}},{_,{error,closed}},
                           {_,{error,closed}},{_,{error,closed}}],4,500).
 	
-accept_timeout(suite) ->
-    [];
-accept_timeout(doc) ->
-    ["Single accept with timeout"];
+%% Single accept with timeout.
 accept_timeout(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2034,10 +1999,7 @@ accept_timeout(Config) when is_list(Config) ->
     P = spawn(F),
     ok = ?EXPECT_ACCEPTS([{P,{error,timeout}}],1,2000).
 
-accept_timeouts_in_order(suite) ->
-    [];
-accept_timeouts_in_order(doc) ->
-    ["Check that multi-accept timeouts happen in the correct order"];
+%% Check that multi-accept timeouts happen in the correct order.
 accept_timeouts_in_order(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2048,10 +2010,7 @@ accept_timeouts_in_order(Config) when is_list(Config) ->
     ok = ?EXPECT_ACCEPTS([{P1,{error,timeout}},{P2,{error,timeout}},
                           {P3,{error,timeout}},{P4,{error,timeout}}],infinity,2000).
 
-accept_timeouts_in_order2(suite) ->
-    [];
-accept_timeouts_in_order2(doc) ->
-    ["Check that multi-accept timeouts happen in the correct order (more)"];
+%% Check that multi-accept timeouts happen in the correct order (more).
 accept_timeouts_in_order2(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2062,10 +2021,7 @@ accept_timeouts_in_order2(Config) when is_list(Config) ->
     ok = ?EXPECT_ACCEPTS([{P4,{error,timeout}},{P3,{error,timeout}},
                           {P2,{error,timeout}},{P1,{error,timeout}}],infinity,2000).
 
-accept_timeouts_in_order3(suite) ->
-    [];
-accept_timeouts_in_order3(doc) ->
-    ["Check that multi-accept timeouts happen in the correct order (even more)"];
+%% Check that multi-accept timeouts happen in the correct order (even more).
 accept_timeouts_in_order3(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2076,11 +2032,8 @@ accept_timeouts_in_order3(Config) when is_list(Config) ->
     ok = ?EXPECT_ACCEPTS([{P4,{error,timeout}},{P1,{error,timeout}},
                           {P3,{error,timeout}},{P2,{error,timeout}}],infinity,2000).
 
-accept_timeouts_in_order4(suite) ->
-    [];
-accept_timeouts_in_order4(doc) ->
-    ["Check that multi-accept timeouts happen in the correct order after "
-     "mixing millsec and sec timeouts"];
+%% Check that multi-accept timeouts happen in the correct order after
+%% mixing millsec and sec timeouts.
 accept_timeouts_in_order4(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2091,11 +2044,8 @@ accept_timeouts_in_order4(Config) when is_list(Config) ->
     ok = ?EXPECT_ACCEPTS([{P1,{error,timeout}},{P2,{error,timeout}},
 			  {P4,{error,timeout}},{P3,{error,timeout}}],infinity,2000).
 
-accept_timeouts_in_order5(suite) ->
-    [];
-accept_timeouts_in_order5(doc) ->
-    ["Check that multi-accept timeouts happen in the correct order after "
-     "mixing millsec and sec timeouts (more)"];
+%% Check that multi-accept timeouts happen in the correct order after
+%% mixing millsec and sec timeouts (more).
 accept_timeouts_in_order5(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2106,11 +2056,8 @@ accept_timeouts_in_order5(Config) when is_list(Config) ->
     ok = ?EXPECT_ACCEPTS([{P4,{error,timeout}},{P1,{error,timeout}},
 			  {P3,{error,timeout}},{P2,{error,timeout}}],infinity,2000).
 
-accept_timeouts_in_order6(suite) ->
-    [];
-accept_timeouts_in_order6(doc) ->
-    ["Check that multi-accept timeouts happen in the correct order after "
-     "mixing millsec and sec timeouts (even more)"];
+%% Check that multi-accept timeouts happen in the correct order after
+%% mixing millsec and sec timeouts (even more).
 accept_timeouts_in_order6(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2121,11 +2068,8 @@ accept_timeouts_in_order6(Config) when is_list(Config) ->
     ok = ?EXPECT_ACCEPTS([{P4,{error,timeout}},{P2,{error,timeout}},
 			  {P3,{error,timeout}},{P1,{error,timeout}}],infinity,2000).
 
-accept_timeouts_in_order7(suite) ->
-    [];
-accept_timeouts_in_order7(doc) ->
-    ["Check that multi-accept timeouts happen in the correct order after "
-     "mixing millsec and sec timeouts (even more++)"];
+%% Check that multi-accept timeouts happen in the correct order after
+%% mixing millsec and sec timeouts (even more++).
 accept_timeouts_in_order7(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2142,10 +2086,7 @@ accept_timeouts_in_order7(Config) when is_list(Config) ->
 			  {P1,{error,timeout}},{P3,{error,timeout}},
 			  {P8,{error,timeout}},{P7,{error,timeout}}],infinity,2000).
 
-accept_timeouts_mixed(suite) ->
-    [];
-accept_timeouts_mixed(doc) ->
-    ["Check that multi-accept timeouts behave correctly when mixed with successful timeouts"];
+%% Check that multi-accept timeouts behave correctly when mixed with successful timeouts.
 accept_timeouts_mixed(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2165,10 +2106,7 @@ accept_timeouts_mixed(Config) when is_list(Config) ->
     gen_tcp:connect("localhost",PortNo,[]),
     ok = ?EXPECT_ACCEPTS([{P4,{ok,Port1}}] when is_port(Port1),infinity,100).
 
-killing_acceptor(suite) ->
-    [];
-killing_acceptor(doc) ->
-    ["Check that single acceptor behaves as expected when killed"];
+%% Check that single acceptor behaves as expected when killed.
 killing_acceptor(Config) when is_list(Config) ->    
     {ok,LS}=gen_tcp:listen(0,[]),
     Pid = spawn(fun() -> erlang:display({accepted,self(),gen_tcp:accept(LS)}) end),
@@ -2183,10 +2121,7 @@ killing_acceptor(Config) when is_list(Config) ->
     false  = lists:member(accepting, L2),
     ok.
 
-killing_multi_acceptors(suite) ->
-    [];
-killing_multi_acceptors(doc) ->
-    ["Check that multi acceptors behaves as expected when killed"];
+%% Check that multi acceptors behaves as expected when killed.
 killing_multi_acceptors(Config) when is_list(Config) ->    
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2208,10 +2143,7 @@ killing_multi_acceptors(Config) when is_list(Config) ->
     false  = lists:member(accepting, L3),
     ok.
 
-killing_multi_acceptors2(suite) ->
-    [];
-killing_multi_acceptors2(doc) ->
-    ["Check that multi acceptors behaves as expected when killed (more)"];
+%% Check that multi acceptors behaves as expected when killed (more).
 killing_multi_acceptors2(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2245,11 +2177,8 @@ killing_multi_acceptors2(Config) when is_list(Config) ->
     false  = lists:member(accepting, L5),
     ok.
     
-several_accepts_in_one_go(suite) ->
-    [];
-several_accepts_in_one_go(doc) ->
-    ["checks that multi-accept works when more than one accept can be "
-     "done at once (wb test of inet_driver)"];
+%% Checks that multi-accept works when more than one accept can be
+%% done at once (wb test of inet_driver).
 several_accepts_in_one_go(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2292,11 +2221,8 @@ wait_until_accepting(Proc,N) ->
     end.
 
 
-accept_system_limit(suite) ->
-    [];
-accept_system_limit(doc) ->
-    ["Check that accept returns {error, system_limit} "
-     "(and not {error, enfile}) when running out of ports"];
+%% Check that accept returns {error, system_limit}
+%% (and not {error, enfile}) when running out of ports.
 accept_system_limit(Config) when is_list(Config) ->
     {ok, LS} = gen_tcp:listen(0, []),
     {ok, TcpPort} = inet:port(LS),
@@ -2345,10 +2271,7 @@ open_ports(L) ->
     end.
 
 
-active_once_closed(suite) ->
-    [];
-active_once_closed(doc) ->
-    ["Check that active once and tcp_close messages behave as expected"];
+%% Check that active once and tcp_close messages behave as expected.
 active_once_closed(Config) when is_list(Config) ->
     (fun() ->
 	     {Loop,A} = setup_closed_ao(),
@@ -2396,10 +2319,7 @@ active_once_closed(Config) when is_list(Config) ->
 	     ok = receive {tcp_closed, A} -> ok after 1000 -> error end
      end)().
    
-send_timeout(suite) ->
-    [];
-send_timeout(doc) ->
-    ["Test the send_timeout socket option"];
+%% Test the send_timeout socket option.
 send_timeout(Config) when is_list(Config) ->
     %% Basic
     BasicFun =
@@ -2486,10 +2406,7 @@ flush() ->
 	    ok
     end.
 
-send_timeout_active(suite) ->
-    [];
-send_timeout_active(doc) ->
-    ["Test the send_timeout socket option for active sockets"];
+%% Test the send_timeout socket option for active sockets.
 send_timeout_active(Config) when is_list(Config) ->
     %% Basic
     BasicFun = 
@@ -2696,10 +2613,8 @@ has_superfluous_schedulers() ->
     end.
 
 
-otp_7731(suite) -> [];    
-otp_7731(doc) -> 
-    "Leaking message from inet_drv {inet_reply,P,ok} "
-    "when a socket sending resumes working after a send_timeout";
+%% Leaking message from inet_drv {inet_reply,P,ok}
+%% when a socket sending resumes working after a send_timeout.
 otp_7731(Config) when is_list(Config) ->
     ServerPid = spawn_link(?MODULE, otp_7731_server, [self()]),
     receive {ServerPid, ready, PortNum} -> ok end,
@@ -2769,8 +2684,7 @@ otp_7731_recv(Socket) ->
 %% OTP-7615: TCP-ports hanging in CLOSING state when sending large
 %% buffer followed by a recv() that returns error due to closed
 %% connection.
-zombie_sockets(suite) -> [];
-zombie_sockets(doc) -> ["OTP-7615 Leaking closed ports."];
+%% OTP-7615 Leaking closed ports.
 zombie_sockets(Config) when is_list(Config) ->
     register(zombie_collector,self()),
     Calls = 10,
@@ -2850,9 +2764,7 @@ zombie_serve_client(Socket, Bin) ->
     gen_tcp:close(Socket),
     zombie_collector ! {closed, Socket}.
 
-otp_7816(suite) -> [];    
-otp_7816(doc) -> 
-    "Hanging send on windows when sending iolist with more than 16 binaries.";
+%% Hanging send on windows when sending iolist with more than 16 binaries.
 otp_7816(Config) when is_list(Config) ->
     Client = self(),
     Server = spawn_link(fun()-> otp_7816_server(Client) end),
@@ -2941,8 +2853,7 @@ otp_7816_recv(CSocket, BytesLeft) ->
 		  error
 	  end.
 
-otp_8102(doc) -> ["Receive a packet with a faulty packet header"];
-otp_8102(suite) -> [];
+%% Receive a packet with a faulty packet header.
 otp_8102(Config) when is_list(Config) ->
     {ok, LSocket} = gen_tcp:listen(0, []),
     {ok, {_, PortNum}} = inet:sockname(LSocket),
@@ -2982,8 +2893,7 @@ otp_8102_do(LSocket, PortNum, {Bin,PType}) ->
     gen_tcp:close(SSocket),    
     gen_tcp:close(RSocket).
 
-otp_9389(doc) -> ["Verify packet_size handles long HTTP header lines"];
-otp_9389(suite) -> [];
+%% Verify packet_size handles long HTTP header lines.
 otp_9389(Config) when is_list(Config) ->
     {ok, LS} = gen_tcp:listen(0, [{active,false}]),
     {ok, {_, PortNum}} = inet:sockname(LS),
@@ -3045,10 +2955,7 @@ otp_9389_loop(S, OrigLinkHdr, State) ->
 wrapping_oct() ->
     [{timetrap,{minutes,10}}].
 
-wrapping_oct(doc) ->
-    "Check that 64bit octet counters work."; 
-wrapping_oct(suite) ->
-    [];
+%% Check that 64bit octet counters work.
 wrapping_oct(Config) when is_list(Config) ->
     {ok,Sock} = gen_tcp:listen(0,[{active,false},{mode,binary}]),
     {ok,Port} = inet:port(Sock),
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index b3925cd83c..f06fd0fcbe 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -71,10 +71,7 @@ end_per_testcase(_Case, Config) ->
 %% Send two packets to a closed port (on some systems this causes the socket
 %% to be closed).
 
-send_to_closed(doc) ->
-    ["Tests core functionality."];
-send_to_closed(suite) ->
-    [];
+%% Tests core functionality.
 send_to_closed(Config) when is_list(Config) ->
     ?line {ok, Sock} = gen_udp:open(0),
     ?line ok = gen_udp:send(Sock, {127,0,0,1}, ?CLOSED_PORT, "foo"),
@@ -88,10 +85,7 @@ send_to_closed(Config) when is_list(Config) ->
 %%-------------------------------------------------------------
 %% Test that the UDP socket buffer sizes are settable
 
-buffer_size(suite) ->
-    [];
-buffer_size(doc) ->
-    ["Test UDP buffer size setting."];
+%% Test UDP buffer size setting.
 buffer_size(Config) when is_list(Config) ->
     ?line Len = 256,
     ?line Bin = list_to_binary(lists:seq(0, Len-1)),
@@ -233,10 +227,7 @@ buffer_size_server_recv(Socket, IP, Port, Cnt) ->
 %% OTP-3823 gen_udp:recv does not return address in binary mode
 %%
 
-binary_passive_recv(suite) ->
-    [];
-binary_passive_recv(doc) ->
-    ["OTP-3823 gen_udp:recv does not return address in binary mode"];
+%% OTP-3823 gen_udp:recv does not return address in binary mode.
 binary_passive_recv(Config) when is_list(Config) ->
     ?line D1       = "The quick brown fox jumps over a lazy dog",
     ?line D2       = list_to_binary(D1),
@@ -262,10 +253,7 @@ binary_passive_recv(Config) when is_list(Config) ->
 %%-------------------------------------------------------------
 %% OTP-3836 inet_udp crashes when IP-address is larger than 255.
 
-bad_address(suite) ->
-    [];
-bad_address(doc) ->
-    ["OTP-3836 inet_udp crashes when IP-address is larger than 255."];
+%% OTP-3836 inet_udp crashes when IP-address is larger than 255.
 bad_address(Config) when is_list(Config) ->
     ?line {ok, R}  = gen_udp:open(0),
     ?line {ok, RP} = inet:port(R),
@@ -295,8 +283,7 @@ bad_address(Config) when is_list(Config) ->
 %% What happens on the SMP emulator remains to be seen...
 %%
 
-read_packets(doc) ->
-    ["OTP-6249 UDP option for number of packet reads."];
+%% OTP-6249 UDP option for number of packet reads.
 read_packets(Config) when is_list(Config) ->
     case erlang:system_info(smp_support) of
 	false ->
@@ -435,10 +422,7 @@ flush() ->
 
 
 
-open_fd(suite) ->
-    [];
-open_fd(doc) ->
-    ["Test that the 'fd' option works"];
+%% Test that the 'fd' option works.
 open_fd(Config) when is_list(Config) ->
     Msg = "Det gör ont när knoppar brista. Varför skulle annars våren tveka?",
     Addr = {127,0,0,1},
@@ -577,10 +561,7 @@ stop_node(Node) ->
     ?t:stop_node(Node).
 
 
-connect(suite) ->
-    [];
-connect(doc) ->
-    ["Test that connect/3 has effect"];
+%% Test that connect/3 has effect.
 connect(Config) when is_list(Config) ->
     ?line Addr = {127,0,0,1},
     ?line {ok,S1} = gen_udp:open(0),
diff --git a/lib/kernel/test/global_SUITE.erl b/lib/kernel/test/global_SUITE.erl
index d1ea0490fd..a9b1c46dd1 100644
--- a/lib/kernel/test/global_SUITE.erl
+++ b/lib/kernel/test/global_SUITE.erl
@@ -148,7 +148,6 @@ end_per_testcase(_Case, Config) ->
 %%% and releases the lock. Now the name should exist on both our own node
 %%% and on the slave node (we wait until that is true; it seems that we
 %%% can do rpc calls to another node before the connection is really up).
-register_1(suite) -> [];
 register_1(Config) when is_list(Config) ->
     Timeout = 15,
     ct:timetrap({seconds,Timeout}),
@@ -217,7 +216,6 @@ lock_global(Parent, Config) ->
 %%% 'try_again_locker' would be called, and this time cause both 1 and 2
 %%% to obtain a lock for 'global' on node 3, which would keep the
 %%% name registry from ever becoming consistent again.
-both_known_1(suite) -> [];
 both_known_1(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
@@ -300,9 +298,7 @@ both_known_1(Config) when is_list(Config) ->
     ?line init_condition(Config),
     ok.
 
-lost_unregister(suite) -> [];
-lost_unregister(doc) ->
-    ["OTP-6428. An unregistered name reappears."];
+%% OTP-6428. An unregistered name reappears.
 lost_unregister(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
@@ -425,7 +421,6 @@ lock_global2(Id, Parent) ->
 %register it as 'test', stop cp1 - cp3 and check that 'test' disappeared.
 %Kill Pid2 and check that 'test' isn't registered.
 
-names(suite) -> [];
 names(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
@@ -514,10 +509,8 @@ names(Config) when is_list(Config) ->
     ?line init_condition(Config),
     ok.
 
-names_hidden(suite) -> [];
-names_hidden(doc) ->
-    ["Tests that names on a hidden node doesn't interfere with names on "
-     "visible nodes."];
+%% Tests that names on a hidden node doesn't interfere with names on
+%% visible nodes.
 names_hidden(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
@@ -620,7 +613,6 @@ names_hidden(Config) when is_list(Config) ->
     ?line init_condition(Config),
     ok.
 
-locks(suite) -> [];
 locks(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
@@ -731,10 +723,8 @@ locks(Config) when is_list(Config) ->
     ok.
     
 
-locks_hidden(suite) -> [];
-locks_hidden(doc) ->
-    ["Tests that locks on a hidden node doesn't interere with locks on "
-     "visible nodes."];
+%% Tests that locks on a hidden node doesn't interere with locks on
+%% visible nodes.
 locks_hidden(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
@@ -813,7 +803,6 @@ locks_hidden(Config) when is_list(Config) ->
     ok.
     
 
-bad_input(suite) -> [];
 bad_input(Config) when is_list(Config) ->
     Timeout = 15,
     ct:timetrap({seconds,Timeout}),
@@ -832,7 +821,6 @@ bad_input(Config) when is_list(Config) ->
     ?line init_condition(Config),
     ok.
 
-names_and_locks(suite) -> [];
 names_and_locks(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
@@ -899,9 +887,7 @@ names_and_locks(Config) when is_list(Config) ->
     ?line init_condition(Config),
     ok.
     
-lock_die(suite) -> [];
-lock_die(doc) ->
-    ["OTP-6341. Remove locks using monitors."];
+%% OTP-6341. Remove locks using monitors.
 lock_die(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
@@ -940,9 +926,7 @@ lock_die(Config) when is_list(Config) ->
     ?line init_condition(Config),
     ok.
 
-name_die(suite) -> [];
-name_die(doc) ->
-    ["OTP-6341. Remove names using monitors."];
+%% OTP-6341. Remove names using monitors.
 name_die(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
@@ -1007,9 +991,7 @@ kill_pid(Pid, File, Config) ->
     exit_p(Pid),
     touch(File, "done").
 
-basic_partition(suite) -> [];
-basic_partition(doc) ->
-    ["Tests that two partitioned networks exchange correct info."];
+%% Tests that two partitioned networks exchange correct info.
 basic_partition(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
@@ -1062,12 +1044,9 @@ basic_partition(Config) when is_list(Config) ->
     ?line init_condition(Config),
     ok.
 
-basic_name_partition(suite) ->
-    [];
-basic_name_partition(doc) ->
-    ["Creates two partitions with two nodes in each partition.",
-     "Tests that names are exchanged correctly, and that EXITs",
-     "during connect phase are handled correctly."];
+%% Creates two partitions with two nodes in each partition.
+%% Tests that names are exchanged correctly, and that EXITs
+%% during connect phase are handled correctly.
 basic_name_partition(Config) when is_list(Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
@@ -1153,11 +1132,8 @@ basic_name_partition(Config) when is_list(Config) ->
 %Check that the values for the registered names are the expected ones, and
 %that the messages from test4 arrive.
 
-advanced_partition(suite) ->
-    [];
-advanced_partition(doc) ->
-    ["Test that names are resolved correctly when two",
-     "partitioned networks connect."];
+%% Test that names are resolved correctly when two
+%% partitioned networks connect.
 advanced_partition(Config) when is_list(Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
@@ -1259,11 +1235,8 @@ advanced_partition(Config) when is_list(Config) ->
 %Now, expect all nodes to be connected and have the same picture of all
 %registered names.
 
-stress_partition(suite) ->
-    [];
-stress_partition(doc) ->
-    ["Stress global, make a partitioned net, make some nodes",
-     "go up/down a bit."];
+%% Stress global, make a partitioned net, make some nodes
+%% go up/down a bit.
 stress_partition(Config) when is_list(Config) ->
     Timeout = 90,
     ct:timetrap({seconds,Timeout}),
@@ -1352,8 +1325,6 @@ stress_partition(Config) when is_list(Config) ->
 %% Use this one to test alot of connection tests
 %%  erl -sname ts -ring_line 10000 -s test_server run_test global_SUITE
 
-ring_line(suite) -> [];
-ring_line(doc) -> [""];
 ring_line(Config) when is_list(Config) ->
     {ok, [[N]]} = init:get_argument(ring_line),
     loop_it(list_to_integer(N), Config).
@@ -1368,12 +1339,9 @@ loop_it(N,M, Config) ->
     loop_it(N-1,M, Config).
 
 
-ring(suite) ->
-    [];
-ring(doc) ->
-    ["Make 10 single nodes, all having the same name.",
-     "Make all ping its predecessor, pinging in a ring.",
-     "Make sure that there's just one winner."];
+%% Make 10 single nodes, all having the same name.
+%% Make all ping its predecessor, pinging in a ring.
+%% Make sure that there's just one winner.
 ring(Config) when is_list(Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
@@ -1456,14 +1424,11 @@ ring(Config) when is_list(Config) ->
     ?line init_condition(Config),
     ok.
 
-simple_ring(suite) ->
-    [];
-simple_ring(doc) ->
-    ["Simpler version of the ring case.  Used because there are some",
-     "distribution problems with many nodes.",
-     "Make 6 single nodes, all having the same name.",
-     "Make all ping its predecessor, pinging in a ring.",
-     "Make sure that there's just one winner."];
+%% Simpler version of the ring case.  Used because there are some
+%% distribution problems with many nodes.
+%% Make 6 single nodes, all having the same name.
+%% Make all ping its predecessor, pinging in a ring.
+%% Make sure that there's just one winner.
 simple_ring(Config) when is_list(Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
@@ -1534,12 +1499,9 @@ simple_ring(Config) when is_list(Config) ->
     ?line init_condition(Config),
     ok.
 
-line(suite) ->
-    [];
-line(doc) ->
-    ["Make 6 single nodes, all having the same name.",
-     "Make all ping its predecessor, pinging in a line.",
-     "Make sure that there's just one winner."];
+%% Make 6 single nodes, all having the same name.
+%% Make all ping its predecessor, pinging in a line.
+%% Make sure that there's just one winner.
 line(Config) when is_list(Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
@@ -1624,14 +1586,11 @@ line(Config) when is_list(Config) ->
     ok.
 
 
-simple_line(suite) ->
-    [];
-simple_line(doc) ->
-    ["Simpler version of the line case.  Used because there are some",
-     "distribution problems with many nodes.",
-     "Make 6 single nodes, all having the same name.",
-     "Make all ping its predecessor, pinging in a line.",
-     "Make sure that there's just one winner."];
+%% Simpler version of the line case.  Used because there are some
+%% distribution problems with many nodes.
+%% Make 6 single nodes, all having the same name.
+%% Make all ping its predecessor, pinging in a line.
+%% Make sure that there's just one winner.
 simple_line(Config) when is_list(Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
@@ -1702,9 +1661,7 @@ simple_line(Config) when is_list(Config) ->
     ?line init_condition(Config),
     ok.
     
-otp_1849(suite) -> [];
-otp_1849(doc) ->
-    ["Test ticket: Global should keep track of all pids that set the same lock."];
+%% Test ticket: Global should keep track of all pids that set the same lock.
 otp_1849(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
@@ -1789,9 +1746,7 @@ otp_1849(Config) when is_list(Config) ->
     ok.
     
 
-otp_3162(suite) -> [];
-otp_3162(doc) ->
-    ["Test ticket: Deadlock in global"];
+%% Test ticket: Deadlock in global.
 otp_3162(Config) when is_list(Config) ->
     StartFun = fun() ->
                        {ok, Cp1} = start_node(cp1, Config),
@@ -1864,9 +1819,7 @@ do_otp_3162(StartFun, Config) ->
     ok.
     
 
-otp_5640(suite) -> [];
-otp_5640(doc) ->
-    ["OTP-5640. 'allow' multiple names for registered processes."];
+%% OTP-5640. 'allow' multiple names for registered processes.
 otp_5640(Config) when is_list(Config) ->
     Timeout = 25,
     ct:timetrap({seconds,Timeout}),
@@ -1935,9 +1888,7 @@ otp_5640_proc(_Parent) ->
             exit(normal)
     end.
 
-otp_5737(suite) -> [];
-otp_5737(doc) ->
-    ["OTP-5737. set_lock/3 and trans/4 accept Retries = 0."];
+%% OTP-5737. set_lock/3 and trans/4 accept Retries = 0.
 otp_5737(Config) when is_list(Config) ->
     Timeout = 25,
     ct:timetrap({seconds,Timeout}),
@@ -1963,8 +1914,7 @@ otp_5737(Config) when is_list(Config) ->
     ?line init_condition(Config),
     ok.
 
-otp_6931(suite) -> [];
-otp_6931(doc) -> ["OTP-6931. Ignore nodeup when connect_all=false."];
+%% OTP-6931. Ignore nodeup when connect_all=false.
 otp_6931(Config) when is_list(Config) ->
     Me = self(),
     ?line {ok, CAf} = start_non_connecting_node(ca_false, Config),
@@ -1981,8 +1931,7 @@ otp_6931(Config) when is_list(Config) ->
 %%%-----------------------------------------------------------------
 %%% Testing a disconnected node. Not two partitions.
 %%%-----------------------------------------------------------------
-simple_disconnect(suite) -> [];
-simple_disconnect(doc) -> ["OTP-5563. Disconnected nodes (not partitions)"];
+%% OTP-5563. Disconnected nodes (not partitions).
 simple_disconnect(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
@@ -2073,8 +2022,7 @@ simple_dis_node(_Node, DisNodes, _Name, _Resolver, Config) ->
 
 -define(RES(F), {F, fun ?MODULE:F/3}).
 
-simple_resolve(suite) -> [];
-simple_resolve(doc) -> ["OTP-5563. Partitions and names."];
+%% OTP-5563. Partitions and names.
 simple_resolve(Config) when is_list(Config) ->
     Timeout = 360,
     ct:timetrap({seconds,Timeout}),
@@ -2206,8 +2154,7 @@ simple_resolve(Config) when is_list(Config) ->
     ?line init_condition(Config),
     ok.
 
-simple_resolve2(suite) -> [];
-simple_resolve2(doc) -> ["OTP-5563. Partitions and names."];
+%% OTP-5563. Partitions and names.
 simple_resolve2(Config) when is_list(Config) ->
     %% Continuation of simple_resolve. Of some reason it did not
     %% always work to re-start z_2. "Cannot be a global bug."
@@ -2243,8 +2190,7 @@ simple_resolve2(Config) when is_list(Config) ->
     ?line init_condition(Config),
     ok.
 
-simple_resolve3(suite) -> [];
-simple_resolve3(doc) -> ["OTP-5563. Partitions and names."];
+%% OTP-5563. Partitions and names.
 simple_resolve3(Config) when is_list(Config) ->
     %% Continuation of simple_resolve.
 
@@ -2456,8 +2402,7 @@ mon_by_servers(Proc) ->
 
 -define(REGNAME, contact_a_2).
 
-leftover_name(suite) -> [];
-leftover_name(doc) -> ["OTP-5563. Bug: nodedown while synching."];
+%% OTP-5563. Bug: nodedown while synching.
 leftover_name(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
@@ -2551,8 +2496,7 @@ halt_node(Node) ->
 %%%-----------------------------------------------------------------
 %%% Testing re-registration of a name.
 %%%-----------------------------------------------------------------
-re_register_name(suite) -> [];
-re_register_name(doc) -> ["OTP-5563. Name is re-registered."];
+%% OTP-5563. Name is re-registered.
 re_register_name(Config) when is_list(Config) ->
     %% When re-registering a name the link to the old pid used to
     %% linger on. Don't think is was a serious bug though--some memory
@@ -2584,8 +2528,7 @@ proc(Parent) ->
 %%%-----------------------------------------------------------------
 %%% 
 %%%-----------------------------------------------------------------
-name_exit(suite) -> [];
-name_exit(doc) -> ["OTP-5563. Registered process dies."];
+%% OTP-5563. Registered process dies.
 name_exit(Config) when is_list(Config) ->
     StartFun = fun() ->
                        {ok, N1} = start_node_rel(n_1, this, Config),
@@ -2658,8 +2601,7 @@ long_lock(Parent) ->
 %%%-----------------------------------------------------------------
 %%% Testing the support for external nodes (cnodes)
 %%%-----------------------------------------------------------------
-external_nodes(suite) -> [];
-external_nodes(doc) -> ["OTP-5563. External nodes (cnodes)."];
+%% OTP-5563. External nodes (cnodes).
 external_nodes(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
@@ -2792,10 +2734,7 @@ cnode_proc(E) ->
     cnode_proc(E).
 
 
-many_nodes(suite) ->
-    [];
-many_nodes(doc) ->
-    ["OTP-5770. Start many nodes. Make them connect at the same time."];
+%% OTP-5770. Start many nodes. Make them connect at the same time.
 many_nodes(Config) when is_list(Config) ->
     Timeout = 240,
     ct:timetrap({seconds,Timeout}),
@@ -2934,9 +2873,7 @@ sync_until(LogFile) ->
 shuffle(L) ->
     [E || {_, E} <- lists:keysort(1, [{rand:uniform(), E} || E <- L])].
 
-sync_0(suite) -> [];
-sync_0(doc) ->
-    ["OTP-5770. sync/0."];
+%% OTP-5770. sync/0.
 sync_0(Config) when is_list(Config) ->
     Timeout = 180,
     ct:timetrap({seconds,Timeout}),
@@ -2977,8 +2914,7 @@ start_and_sync([Name | Names]) ->
 %%%-----------------------------------------------------------------
 %%% Testing of change of global_groups parameter.
 %%%-----------------------------------------------------------------
-global_groups_change(suite) -> [];
-global_groups_change(doc) -> ["Test change of global_groups parameter."];
+%% Test change of global_groups parameter.
 global_groups_change(Config) ->
     Timeout = 90,
     ct:timetrap({seconds,Timeout}),
@@ -3864,10 +3800,7 @@ dbg_logs(Name, Nodes) ->
 		  end, Nodes).
 
 
-global_lost_nodes(suite) ->
-    [];
-global_lost_nodes(doc) ->
-    ["Tests that locally loaded nodes do not loose contact with other nodes."];
+%% Tests that locally loaded nodes do not loose contact with other nodes.
 global_lost_nodes(Config) when is_list(Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
@@ -3938,10 +3871,7 @@ lost_nodes_waiter(N1, N2) ->
 
 
 
-mass_death(suite) ->
-    [];
-mass_death(doc) ->
-    ["Tests the simultaneous death of many processes with registered names"];
+%% Tests the simultaneous death of many processes with registered names.
 mass_death(Config) when is_list(Config) ->
     Timeout = 90,
     ct:timetrap({seconds,Timeout}),
@@ -4158,8 +4088,6 @@ remove_gg_pub_type([{GG, _, Nodes}|Rest]) ->
 %% Better do this in a slave node.
 %% (The transition from links to monitors does not affect this case.)
 
-garbage_messages(suite) ->
-    [];
 garbage_messages(Config) when is_list(Config) ->
     Timeout = 25,
     ct:timetrap({seconds,Timeout}),
diff --git a/lib/kernel/test/global_group_SUITE.erl b/lib/kernel/test/global_group_SUITE.erl
index bfdcb87dc5..2fad1eafdd 100644
--- a/lib/kernel/test/global_group_SUITE.erl
+++ b/lib/kernel/test/global_group_SUITE.erl
@@ -94,8 +94,7 @@ end_per_testcase(_Func, _Config) ->
 %%-----------------------------------------------------------------
 
 
-start_gg_proc(suite) -> [];
-start_gg_proc(doc) -> ["Check that the global_group processes are started automatically. "];
+%% Check that the global_group processes are started automatically. .
 start_gg_proc(Config) when is_list(Config) ->
     Dir = proplists:get_value(priv_dir, Config),
     ?line File = filename:join(Dir, "global_group.config"),
@@ -125,9 +124,8 @@ start_gg_proc(Config) when is_list(Config) ->
     
 
 
-no_gg_proc(suite) -> [];
-no_gg_proc(doc) -> ["Start a system without global groups. Nodes are not "
-		    "synced at start (sync_nodes_optional is not defined)"];
+%% Start a system without global groups. Nodes are not
+%% synced at start (sync_nodes_optional is not defined).
 no_gg_proc(Config) when is_list(Config) ->
     Dir = proplists:get_value(priv_dir, Config),
     ?line File = filename:join(Dir, "no_global_group.config"),
@@ -294,10 +292,8 @@ no_gg_proc(Config) when is_list(Config) ->
 
 
 
-no_gg_proc_sync(suite) -> [];
-no_gg_proc_sync(doc) -> 
-    ["Start a system without global groups, but syncing the nodes by using " 
-     "sync_nodes_optional."];
+%% Start a system without global groups, but syncing the nodes by using
+%% sync_nodes_optional.
 no_gg_proc_sync(Config) when is_list(Config) ->
     Dir = proplists:get_value(priv_dir, Config),
     ?line File = filename:join(Dir, "no_global_group_sync.config"),
@@ -466,9 +462,7 @@ no_gg_proc_sync(Config) when is_list(Config) ->
 
 
 
-compatible(suite) -> [];
-compatible(doc) -> 
-    ["Check that a system without global groups is compatible with the old R4 system."];
+%% Check that a system without global groups is compatible with the old R4 system.
 compatible(Config) when is_list(Config) ->
     Dir = proplists:get_value(priv_dir, Config),
     ?line File = filename:join(Dir, "global_group_comp.config"),
@@ -637,8 +631,7 @@ compatible(Config) when is_list(Config) ->
 
 
 
-one_grp(suite) -> [];
-one_grp(doc) -> ["Test a system with only one global group. "];
+%% Test a system with only one global group. .
 one_grp(Config) when is_list(Config) ->
     Dir = proplists:get_value(priv_dir, Config),
     ?line File = filename:join(Dir, "global_group.config"),
@@ -720,9 +713,8 @@ one_grp(Config) when is_list(Config) ->
 
 
 
-one_grp_x(suite) -> [];
-one_grp_x(doc) -> ["Check a system with only one global group. "
-		   "Start the nodes with different time intervals. "];
+%% Check a system with only one global group.
+%% Start the nodes with different time intervals.
 one_grp_x(Config) when is_list(Config) ->
     Dir = proplists:get_value(priv_dir, Config),
     ?line File = filename:join(Dir, "global_group.config"),
@@ -780,8 +772,7 @@ one_grp_x(Config) when is_list(Config) ->
 
 
 
-two_grp(suite) -> [];
-two_grp(doc) -> ["Test a two global group system. "];
+%% Test a two global group system. .
 two_grp(Config) when is_list(Config) ->
     Dir = proplists:get_value(priv_dir, Config),
     ?line File = filename:join(Dir, "global_group.config"),
@@ -1077,8 +1068,7 @@ two_grp(Config) when is_list(Config) ->
     
 
 
-hidden_groups(suite) -> [];
-hidden_groups(doc) -> ["Test hidden global groups."];
+%% Test hidden global groups.
 hidden_groups(Config) when is_list(Config) ->
     Dir = proplists:get_value(priv_dir, Config),
     ?line File = filename:join(Dir, "global_group.config"),
@@ -1149,8 +1139,7 @@ hidden_groups(Config) when is_list(Config) ->
     ok.
     
 
-test_exit(suite) -> [];
-test_exit(doc) -> ["Checks when the search process exits. "];
+%% Checks when the search process exits. .
 test_exit(Config) when is_list(Config) ->
     ?line NN = node_name(atom_to_list(node())),
     ?line Cp1nn = list_to_atom("cp1@" ++ NN),
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl
index 3b12549194..508b090c33 100644
--- a/lib/kernel/test/heart_SUITE.erl
+++ b/lib/kernel/test/heart_SUITE.erl
@@ -117,8 +117,6 @@ start_check(Type, Name, Envs) ->
     end,
     {ok, Node}.
 
-start(doc) -> [];
-start(suite) -> {req, [{time, 10}]};
 start(Config) when is_list(Config) ->
     {ok, Node} = start_check(slave, heart_test),
     rpc:call(Node, init, reboot, []),
@@ -144,14 +142,6 @@ start(Config) when is_list(Config) ->
 %% restart
 %% Purpose:
 %%   Check that a node is up and running after a init:restart/0
-restart(doc) -> [];
-restart(suite) -> 
-   case ?t:os_type() of
-	{Fam, _} when Fam == unix; Fam == win32 ->
-	    {req, [{time,10}]};
-	_ ->
-	    {skip, "Only run on unix and win32"}
-    end;
 restart(Config) when is_list(Config) ->
     {ok, Node} = start_check(loose, heart_test),
     rpc:call(Node, init, restart, []),
@@ -168,8 +158,6 @@ restart(Config) when is_list(Config) ->
 %% reboot
 %% Purpose:
 %%   Check that a node is up and running after a init:reboot/0
-reboot(doc) -> [];
-reboot(suite) -> {req, [{time, 10}]};
 reboot(Config) when is_list(Config) ->
     {ok, Node} = start_check(slave, heart_test),
 
@@ -195,7 +183,6 @@ reboot(Config) when is_list(Config) ->
 %% May currently dump core in beam debug build due to lock-order violation
 %% This should be removed when a non-lockad information retriever is implemented
 %% for crash dumps
-node_start_immediately_after_crash(suite) -> {req, [{time, 10}]};
 node_start_immediately_after_crash(Config) when is_list(Config) ->
     Config2 = ignore_cores:setup(?MODULE, node_start_immediately_after_crash, Config, true),
     try
@@ -247,7 +234,6 @@ node_start_immediately_after_crash_test(Config) when is_list(Config) ->
 %% May currently dump core in beam debug build due to lock-order violation
 %% This should be removed when a non-lockad information retriever is implemented
 %% for crash dumps
-node_start_soon_after_crash(suite) -> {req, [{time, 10}]};
 node_start_soon_after_crash(Config) when is_list(Config) ->
     Config2 = ignore_cores:setup(?MODULE, node_start_soon_after_crash, Config, true),
     try
@@ -299,7 +285,6 @@ node_check_up_down(Node, Tmo) ->
     end.
 
 %% Only tests bad command, correct behaviour is tested in reboot/1.
-set_cmd(suite) -> [];
 set_cmd(Config) when is_list(Config) ->
     {ok, Node} = start_check(slave, heart_test),
     Cmd = wrong_atom,
@@ -313,7 +298,6 @@ set_cmd(Config) when is_list(Config) ->
     stop_node(Node),
     ok.
 
-clear_cmd(suite) -> {req,[{time,15}]};
 clear_cmd(Config) when is_list(Config) ->
     {ok, Node} = start_check(slave, heart_test),
     ok = rpc:call(Node, heart, set_cmd,
@@ -352,7 +336,6 @@ clear_cmd(Config) when is_list(Config) ->
     end,
     ok.
 
-get_cmd(suite) -> [];
 get_cmd(Config) when is_list(Config) ->
     {ok, Node} = start_check(slave, heart_test),
     Cmd = "test",
@@ -424,15 +407,13 @@ options_api(Config) when is_list(Config) ->
     ok.
 
 
-dont_drop(suite) -> 
 %%% Removed as it may crash epmd/distribution in colourful
 %%% ways. While we ARE finding out WHY, it would
 %%% be nice for others to be able to run the kernel test suite
-%%% without "exploding machines", so thats why I removed it for now.
-    [];
-dont_drop(doc) ->
-    ["Tests that the heart command does not get dropped when ",
-     "set just before halt on very high I/O load."];
+%%% without "exploding machines", so that's why I removed it for now.
+
+%% Tests that the heart command does not get dropped when
+%% set just before halt on very high I/O load..
 dont_drop(Config) when is_list(Config) ->
     %%% Have to do it some times to make it happen...
     [ok,ok,ok,ok,ok,ok,ok,ok,ok,ok] = do_dont_drop(Config,10),
@@ -487,11 +468,8 @@ wait_for_any_of(N1,N2,Times) ->
     end.
 
 
-kill_pid(suite) ->
-    [];
-kill_pid(doc) ->
-    ["Tests that heart kills the old erlang node before executing ",
-     "heart command."];
+%% Tests that heart kills the old erlang node before executing
+%% heart command.
 kill_pid(Config) when is_list(Config) ->
     ok = do_kill_pid(Config).
 
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index 5719955f86..e7eac08d98 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -116,7 +116,7 @@ end_per_testcase(_Func, _Config) ->
 
 t_gethostbyaddr() ->
     required(v4).
-t_gethostbyaddr(doc) -> "Test the inet:gethostbyaddr/1 function.";
+%% Test the inet:gethostbyaddr/1 function.
 t_gethostbyaddr(Config) when is_list(Config) ->
     {Name,FullName,IPStr,{A,B,C,D}=IP,Aliases,_,_} = ct:get_config(test_host_ipv4_only),
     Rname = integer_to_list(D) ++ "." ++
@@ -152,7 +152,7 @@ t_gethostbyaddr(Config) when is_list(Config) ->
     ok.
 
 t_gethostbyaddr_v6() -> required(v6).
-t_gethostbyaddr_v6(doc) -> "Test the inet:gethostbyaddr/1 inet6 function.";
+%% Test the inet:gethostbyaddr/1 inet6 function.
 t_gethostbyaddr_v6(Config) when is_list(Config) ->
     ?line {Name6, FullName6, IPStr6, IP6, Aliases6} =
 	ct:get_config(test_host_ipv6_only),
@@ -182,8 +182,7 @@ t_gethostbyaddr_v6(Config) when is_list(Config) ->
     end.
 
 t_gethostbyname() -> required(v4).
-t_gethostbyname(doc) -> "Test the inet:gethostbyname/1 function.";
-t_gethostbyname(suite) -> [];
+%% Test the inet:gethostbyname/1 function.
 t_gethostbyname(Config) when is_list(Config) ->
     ?line {Name,FullName,IPStr,IP,Aliases,IP_46_Str,_} =
 	ct:get_config(test_host_ipv4_only),
@@ -223,8 +222,7 @@ t_gethostbyname(Config) when is_list(Config) ->
     ok.
 
 t_gethostbyname_v6() -> required(v6).
-t_gethostbyname_v6(doc) -> "Test the inet:gethostbyname/1 inet6 function.";
-t_gethostbyname_v6(suite) -> [];
+%% Test the inet:gethostbyname/1 inet6 function.
 t_gethostbyname_v6(Config) when is_list(Config) ->
     {Name, FullName, IPStr, IP, Aliases} =
 	ct:get_config(test_host_ipv6_only),
@@ -288,8 +286,7 @@ check_elem(Val, [], Tests0) ->
 
 
 t_getaddr() -> required(v4).
-t_getaddr(doc) -> "Test the inet:getaddr/2 function.";
-t_getaddr(suite) -> [];
+%% Test the inet:getaddr/2 function.
 t_getaddr(Config) when is_list(Config) ->
     ?line {Name,FullName,IPStr,IP,_,IP_46_Str,IP46} =
 	ct:get_config(test_host_ipv4_only),
@@ -309,8 +306,7 @@ t_getaddr(Config) when is_list(Config) ->
     ok.
 
 t_getaddr_v6() -> required(v4) ++ required(v6).
-t_getaddr_v6(doc) -> "Test the inet:getaddr/2 function.";
-t_getaddr_v6(suite) -> [];
+%% Test the inet:getaddr/2 function.
 t_getaddr_v6(Config) when is_list(Config) ->
     {Name,FullName,IPStr,IP,_} =
 	ct:get_config(test_host_ipv6_only),
@@ -338,8 +334,7 @@ t_getaddr_v6(Config) when is_list(Config) ->
     end.
 
 ipv4_to_ipv6() -> required(v4).
-ipv4_to_ipv6(doc) -> "Test if IPv4 address is converted to IPv6 address.";
-ipv4_to_ipv6(suite) -> [];
+%% Test if IPv4 address is converted to IPv6 address.
 ipv4_to_ipv6(Config) when is_list(Config) ->
     %% Test what happens if an IPv4 address is looked up in an IPv6 context.
     %% If the native resolver succeeds to look it up, an IPv4 compatible
@@ -376,9 +371,8 @@ ipv4_to_ipv6(Config) when is_list(Config) ->
 host_and_addr() ->
     [{timetrap,{minutes,5}}|required(hosts)].
 
-host_and_addr(doc) -> ["Test looking up hosts and addresses. Use 'ypcat hosts' ",
-		       "or the local eqivalent to find all hosts."];
-host_and_addr(suite) -> [];
+%% Test looking up hosts and addresses. Use 'ypcat hosts'
+%% or the local eqivalent to find all hosts.
 host_and_addr(Config) when is_list(Config) ->
     ?line lists:foreach(fun try_host/1, get_hosts(Config)),
     ok.
@@ -620,8 +614,6 @@ parse_strict_address(Config) when is_list(Config) ->
     {ok, {3089,3106,23603,50240,0,0,119,136}} =
 	inet:parse_strict_address("c11:0c22:5c33:c440::077:0088").
 
-t_gethostnative(suite) ->[];
-t_gethostnative(doc) ->[];
 t_gethostnative(Config) when is_list(Config) ->
 %% this will result in 26 bytes sent which causes problem in Windows
 %% if the port-program has not assured stdin to be read in BINARY mode
@@ -634,10 +626,7 @@ t_gethostnative(Config) when is_list(Config) ->
 	    ?line ok
     end.
 
-gethostnative_parallell(suite) ->    
-    [];
-gethostnative_parallell(doc) ->
-    ["Check that the emulator survives crashes in gethost_native"];
+%% Check that the emulator survives crashes in gethost_native.
 gethostnative_parallell(Config) when is_list(Config) ->
     ?line {ok,Hostname} = inet:gethostname(),
     ?line {ok,_} = inet:gethostbyname(Hostname),
@@ -761,10 +750,7 @@ wait_for_gethost(N) ->
 	    wait_for_gethost(N-1)
     end.
 	    
-cname_loop(suite) ->
-    [];
-cname_loop(doc) ->
-    ["Check that the resolver handles a CNAME loop"];
+%% Check that the resolver handles a CNAME loop.
 cname_loop(Config) when is_list(Config) ->
     %% getbyname (hostent_by_domain)
     ?line ok = inet_db:add_rr("mydomain.com", in, ?S_CNAME, ttl, "mydomain.com"),
@@ -791,11 +777,9 @@ cname_loop(Config) when is_list(Config) ->
 				lookup_processes=20}).
 
 gethostnative_soft_restart() -> required(hosts).
-gethostnative_soft_restart(suite) ->    
-    [];
-gethostnative_soft_restart(doc) ->
-    ["Check that no name lookups fails during soft restart "
-     "of inet_gethost_native"];
+
+%% Check that no name lookups fails during soft restart
+%% of inet_gethost_native.
 gethostnative_soft_restart(Config) when is_list(Config) ->
     ?line gethostnative_control(Config, 
 				#gethostnative_control{
@@ -803,11 +787,9 @@ gethostnative_soft_restart(Config) when is_list(Config) ->
 
 
 gethostnative_debug_level() -> required(hosts).
-gethostnative_debug_level(suite) ->    
-    [];
-gethostnative_debug_level(doc) ->
-    ["Check that no name lookups fails during debug level change "
-     "of inet_gethost_native"];
+
+%% Check that no name lookups fails during debug level change
+%% of inet_gethost_native.
 gethostnative_debug_level(Config) when is_list(Config) ->
     ?line gethostnative_control(Config, 
 				#gethostnative_control{
@@ -930,10 +912,7 @@ lookup_loop([H|Hs], Delay, Tag, Parent, Cnt, Hosts) ->
 
 
 
-lookup_bad_search_option(suite) ->
-    [];
-lookup_bad_search_option(doc) ->
-    ["Test lookup with erroneously configured lookup option (OTP-12133)"];
+%% Test lookup with erroneously configured lookup option (OTP-12133).
 lookup_bad_search_option(Config) when is_list(Config) ->
     %% Manipulation of resolver config is done in init_per_testcase
     %% and end_per_testcase to ensure cleanup.
@@ -943,10 +922,7 @@ lookup_bad_search_option(Config) when is_list(Config) ->
 
 
 
-getif(suite) ->
-    [];
-getif(doc) ->
-    ["Tests basic functionality of getiflist, getif, and ifget"];
+%% Tests basic functionality of getiflist, getif, and ifget.
 getif(Config) when is_list(Config) ->
     ?line case os:type() of
 	      {unix,Osname} ->
@@ -987,8 +963,7 @@ do_getif(Osname) ->
     ?line true = ip_member(Loopback, Addresses),
     ?line ok.
 
-getif_ifr_name_overflow(doc) ->
-    "Test long interface names do not overrun buffer";
+%% Test long interface names do not overrun buffer.
 getif_ifr_name_overflow(Config) when is_list(Config) ->
     ?line case os:type() of
 	      {unix,Osname} ->
@@ -1002,15 +977,13 @@ do_getif_ifr_name_overflow(_) ->
     ?line {ok,[]} = inet:ifget(lists:duplicate(128, "x"), [addr]),
     ok.
 
-getservbyname_overflow(doc) ->
-    "Test long service names do not overrun buffer";
+%% Test long service names do not overrun buffer.
 getservbyname_overflow(Config) when is_list(Config) ->
     %% emulator should not crash
     ?line {error,einval} = inet:getservbyname(list_to_atom(lists:flatten(lists:duplicate(128, "x"))), tcp),
     ok.
 
-getifaddrs(doc) ->
-    "Test inet:gifaddrs/0";
+%% Test inet:gifaddrs/0.
 getifaddrs(Config) when is_list (Config) ->
     ?line {ok,IfAddrs} = inet:getifaddrs(),
     io:format("IfAddrs = ~p.~n", [IfAddrs]),
diff --git a/lib/kernel/test/inet_res_SUITE.erl b/lib/kernel/test/inet_res_SUITE.erl
index 6f1e0126c9..a82849b2d3 100644
--- a/lib/kernel/test/inet_res_SUITE.erl
+++ b/lib/kernel/test/inet_res_SUITE.erl
@@ -277,8 +277,7 @@ proxy_ns({proxy,_,_,ProxyNS}) -> ProxyNS.
 %%
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-basic(doc) ->
-    ["Lookup an A record with different API functions"];
+%% Lookup an A record with different API functions.
 basic(Config) when is_list(Config) ->
     NS = ns(Config),
     Name = "ns.otptest",
@@ -340,8 +339,7 @@ basic(Config) when is_list(Config) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-resolve(doc) ->
-    ["Lookup different records using resolve/2..4"];
+%% Lookup different records using resolve/2..4.
 resolve(Config) when is_list(Config) ->
     Class = in,
     NS = ns(Config),
@@ -471,8 +469,7 @@ check_msg(Class, Type, Msg, AnList, NsList) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-edns0(doc) ->
-    ["Test EDNS and truncation"];
+%% Test EDNS and truncation.
 edns0(Config) when is_list(Config) ->
     NS = ns(Config),
     Domain = "otptest",
@@ -533,10 +530,7 @@ inet_res_filter(Anlist, Class, Type) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-txt_record(suite) ->
-    [];
-txt_record(doc) ->
-    ["Tests TXT records"];
+%% Tests TXT records.
 txt_record(Config) when is_list(Config) ->
     D1 = "cslab.ericsson.net",
     D2 = "mail1.cslab.ericsson.net",
@@ -555,10 +549,7 @@ txt_record(Config) when is_list(Config) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-files_monitor(suite) ->
-    [];
-files_monitor(doc) ->
-    ["Tests monitoring of /etc/hosts and /etc/resolv.conf, but not them"];
+%% Tests monitoring of /etc/hosts and /etc/resolv.conf, but not them.
 files_monitor(Config) when is_list(Config) ->
     Search = inet_db:res_option(search),
     HostsFile = inet_db:res_option(hosts_file),
@@ -647,8 +638,7 @@ do_files_monitor(Config) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-last_ms_answer(doc) ->
-    ["Answer just when timeout is triggered (OTP-9221)"];
+%% Answer just when timeout is triggered (OTP-9221).
 last_ms_answer(Config) when is_list(Config) ->
     NS = ns(Config),
     Name = "ns.otptest",
diff --git a/lib/kernel/test/inet_sockopt_SUITE.erl b/lib/kernel/test/inet_sockopt_SUITE.erl
index bc77127363..154cd3a89f 100644
--- a/lib/kernel/test/inet_sockopt_SUITE.erl
+++ b/lib/kernel/test/inet_sockopt_SUITE.erl
@@ -97,8 +97,7 @@ init_per_testcase(_Func, Config) ->
 end_per_testcase(_Func, _Config) ->
     ok.
 
-simple(suite) -> [];
-simple(doc) -> "Test inet:setopt/getopt simple functionality.";
+%% Test inet:setopt/getopt simple functionality.
 simple(Config) when is_list(Config) ->
     ?line XOpt = case os:type() of
 		     {unix,_} -> [{reuseaddr,true}];
@@ -119,8 +118,7 @@ simple(Config) when is_list(Config) ->
     ?line gen_tcp:close(S2),
     ok.
 
-loop_all(suite) -> [];
-loop_all(doc) -> "Loop through all socket options and check that they work";
+%% Loop through all socket options and check that they work.
 loop_all(Config) when is_list(Config) ->
     ?line ListenFailures = 
 	lists:foldr(make_check_fun(listen,1),[],all_listen_options()),
@@ -137,13 +135,11 @@ loop_all(Config) when is_list(Config) ->
 
 
 
-simple_raw(suite) -> [];
-simple_raw(doc) -> "Test simple setopt/getopt of raw options.";
+%% Test simple setopt/getopt of raw options.
 simple_raw(Config) when is_list(Config) ->
     do_simple_raw(Config,false).
-simple_raw_getbin(suite) -> [];
-simple_raw_getbin(doc) -> "Test simple setopt/getopt of raw options, "
-			      "with binaries in getopt.";
+
+%% Test simple setopt/getopt of raw options, with binaries in getopt.
 simple_raw_getbin(Config) when is_list(Config) ->
     do_simple_raw(Config,true).
 
@@ -189,13 +185,12 @@ nintbin2int(<<>>) -> 0.
 
 
 
-multiple_raw(suite) -> [];
-multiple_raw(doc) -> "Test setopt/getopt of multiple raw options.";
+%% Test setopt/getopt of multiple raw options.
 multiple_raw(Config) when is_list(Config) ->
     do_multiple_raw(Config,false).
-multiple_raw_getbin(suite) -> [];
-multiple_raw_getbin(doc) -> "Test setopt/getopt of multiple raw options, "
-			      "with binaries in getopt.";
+
+%% Test setopt/getopt of multiple raw options, with binaries in
+%% getopt.
 multiple_raw_getbin(Config) when is_list(Config) ->
     do_multiple_raw(Config,true).
 
@@ -265,17 +260,15 @@ do_multiple_raw(Config, Binary) ->
 
 
 
-doc_examples_raw(suite) -> [];
-doc_examples_raw(doc) -> "Test that the example code from the documentation "
-			     "works";
+%% Test that the example code from the documentation works.
 doc_examples_raw(Config) when is_list(Config) ->
     do_doc_examples_raw(Config,false).
-doc_examples_raw_getbin(suite) -> [];
-doc_examples_raw_getbin(doc) -> "Test that the example code from the "
-				    "documentation works when getopt uses "
-				    "binaries";
+
+%% Test that the example code from the documentation works when getopt
+%% uses binaries.
 doc_examples_raw_getbin(Config) when is_list(Config) ->
     do_doc_examples_raw(Config,true).
+
 do_doc_examples_raw(Config,Binary) when is_list(Config) ->
     ?line Port = start_helper(Config),
     ?line Proto = ask_helper(Port,?C_GET_IPPROTO_TCP),
@@ -323,15 +316,15 @@ do_doc_examples_raw(Config,Binary) when is_list(Config) ->
 	    ok
     end.
 	    
-large_raw(suite) -> [];
-large_raw(doc) -> "Test structs and large/too large buffers when raw";
+%% Test structs and large/too large buffers when raw.
 large_raw(Config) when is_list(Config) ->
     do_large_raw(Config,false).
-large_raw_getbin(suite) -> [];
-large_raw_getbin(doc) -> "Test structs and large/too large buffers when raw"
-			 "using binaries to getopts";
+
+%% Test structs and large/too large buffers when raw
+%% using binaries to getopts.
 large_raw_getbin(Config) when is_list(Config) ->
     do_large_raw(Config,true).
+
 do_large_raw(Config,Binary) when is_list(Config) ->
     ?line Port = start_helper(Config),
     ?line Proto = ask_helper(Port,?C_GET_SOL_SOCKET),
@@ -377,15 +370,15 @@ do_large_raw(Config,Binary) when is_list(Config) ->
 	    ok
     end.
 
-combined(suite) -> [];
-combined(doc) -> "Test raw structs combined w/ other options ";
+%% Test raw structs combined w/ other options .
 combined(Config) when is_list(Config) ->
     do_combined(Config,false).
-combined_getbin(suite) -> [];
-combined_getbin(doc) -> "Test raw structs combined w/ other options and "
-			"binarise in getopts";
+
+%% Test raw structs combined w/ other options and
+%% binarise in getopts.
 combined_getbin(Config) when is_list(Config) ->
     do_combined(Config,true).
+
 do_combined(Config,Binary) when is_list(Config) ->
     ?line Port = start_helper(Config),
     ?line Proto = ask_helper(Port,?C_GET_SOL_SOCKET),
@@ -548,18 +541,15 @@ do_combined(Config,Binary) when is_list(Config) ->
 
 
 
-ipv6_v6only_udp(suite) -> [];
-ipv6_v6only_udp(doc) -> "Test socket option ipv6_v6only for UDP";
+%% Test socket option ipv6_v6only for UDP.
 ipv6_v6only_udp(Config) when is_list(Config) ->
     ipv6_v6only(Config, gen_udp).
 
-ipv6_v6only_tcp(suite) -> [];
-ipv6_v6only_tcp(doc) -> "Test socket option ipv6_v6only for TCP";
+%% Test socket option ipv6_v6only for TCP.
 ipv6_v6only_tcp(Config) when is_list(Config) ->
     ipv6_v6only(Config, gen_tcp).
 
-ipv6_v6only_sctp(suite) -> [];
-ipv6_v6only_sctp(doc) -> "Test socket option ipv6_v6only for SCTP";
+%% Test socket option ipv6_v6only for SCTP.
 ipv6_v6only_sctp(Config) when is_list(Config) ->
     ipv6_v6only(Config, gen_sctp).
 
@@ -628,8 +618,7 @@ ipv6_v6only_close(Module, Socket) ->
     Module:close(Socket).
 
 
-use_ipv6_v6only_udp(suite) -> [];
-use_ipv6_v6only_udp(doc) -> "Test using socket option ipv6_v6only for UDP";
+%% Test using socket option ipv6_v6only for UDP.
 use_ipv6_v6only_udp(Config) when is_list(Config) ->
     ?line case gen_udp:open(0, [inet6,{ipv6_v6only,true}]) of
 	      {ok,S6} ->
@@ -693,10 +682,7 @@ sndrcv(Ip, Port, Opts, Data) ->
 
 
 
-type_errors(suite) ->
-    [];
-type_errors(doc) ->
-    "Test that raw data requests are not executed for bad types";
+%% Test that raw data requests are not executed for bad types.
 type_errors(Config) when is_list(Config) ->
     ?line BadSetOptions =
 	[
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index ef8e45a3fd..8cae84b812 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -73,21 +73,15 @@ init_per_testcase(Func, Config) ->
 end_per_testcase(_Func, _Config) ->
     ok.
 
-init(doc) -> [];
-init(suite) -> [];
 init(Config) when is_list(Config) ->
     Config.
 
-fini(doc) -> [];
-fini(suite) -> [];
 fini(Config) when is_list(Config) ->
     Host = list_to_atom(from($@, atom_to_list(node()))),
     Node = list_to_atom(lists:concat([init_test, "@", Host])),
     stop_node(Node),
     Config.
 
-get_arguments(doc) ->[];
-get_arguments(suite) -> {req, [distribution, {local_slave_nodes, 1}]};
 get_arguments(Config) when is_list(Config) ->
     Args = args(),
     ?line {ok, Node} = start_node(init_test, Args),
@@ -172,8 +166,6 @@ check_d(Args) ->
 	    ct:fail(check_d2)
     end.
 
-get_argument(doc) ->[];
-get_argument(suite) -> {req, [distribution, {local_slave_nodes, 1}]};
 get_argument(Config) when is_list(Config) ->
     Args = args(),
     ?line {ok, Node} = start_node(init_test, Args),
@@ -215,8 +207,6 @@ get_argument(Config) when is_list(Config) ->
     stop_node(Node),
     ok.
 
-get_plain_arguments(doc) ->[];
-get_plain_arguments(suite) -> {req, [distribution, {local_slave_nodes, 1}]};
 get_plain_arguments(Config) when is_list(Config) ->
     Longstring = 
 	"fjdkfjdkfjfdaa2fjdkfjdkfjfdaa2fjdkfjdkfjfdaa2"
@@ -246,8 +236,6 @@ get_plain_arguments(Config) when is_list(Config) ->
 %% ------------------------------------------------
 %% Use -boot_var flag to set $TEST_VAR in boot script.
 %% ------------------------------------------------
-boot_var(doc) -> [];
-boot_var(suite) -> {req, [distribution, {local_slave_nodes, 1}]};
 boot_var(Config) when is_list(Config) ->
     {BootScript, TEST_VAR, KernelVsn, StdlibVsn} = create_boot(Config),
 
@@ -307,15 +295,6 @@ is_real_system(KernelVsn, StdlibVsn) ->
 many_restarts() ->
     [{timetrap,{minutes,8}}].
 
-many_restarts(doc) -> [];
-many_restarts(suite) ->
-    case ?t:os_type() of
-	{Fam, _} when Fam == unix; Fam == win32 ->
-	    {req, [distribution, {local_slave_nodes, 1}, {time, 5}]};
-	_ ->
-	    {skip, "Only run on unix and win32"}
-    end;
-
 many_restarts(Config) when is_list(Config) ->
     ?line {ok, Node} = loose_node:start(init_test, "", ?DEFAULT_TIMEOUT_SEC),
     ?line loop_restart(30,Node,rpc:call(Node,erlang,whereis,[error_logger])),
@@ -372,14 +351,6 @@ wait_for(N,Node,EHPid) ->
 %% Therefore the slave process must be killed
 %% before restart.
 %% ------------------------------------------------
-restart(doc) -> [];
-restart(suite) ->
-    case ?t:os_type() of
-	{Fam, _} when Fam == unix; Fam == win32 ->
-	    {req, [distribution, {local_slave_nodes, 1}, {time, 5}]};
-	_ ->
-	    {skip, "Only run on unix and win32"}
-    end;
 restart(Config) when is_list(Config) ->
     ?line Args = args(),
 
@@ -468,8 +439,6 @@ apid(Pid) ->
 %% The reboot facility using heart is tested
 %% in the heart_SUITE.
 %% ------------------------------------------------
-reboot(doc) -> [];
-reboot(suite) -> {req, [distribution, {local_slave_nodes, 1}]};
 reboot(Config) when is_list(Config) ->
     Args = args(),
     ?line {ok, Node} = start_node(init_test, Args),
@@ -495,8 +464,6 @@ reboot(Config) when is_list(Config) ->
 %% ------------------------------------------------
 %%
 %% ------------------------------------------------
-stop(doc) -> [];
-stop(suite) -> [];
 stop(Config) when is_list(Config) ->
     Args = args(),
     ?line {ok, Node} = start_node(init_test, Args),
@@ -522,8 +489,6 @@ stop(Config) when is_list(Config) ->
 %% ------------------------------------------------
 %% 
 %% ------------------------------------------------
-get_status(doc) -> [];
-get_status(suite) -> [];
 get_status(Config) when is_list(Config) ->
     ?line {Start, _} = init:get_status(),
 
@@ -540,8 +505,6 @@ get_status(Config) when is_list(Config) ->
 %% ------------------------------------------------
 %% 
 %% ------------------------------------------------
-script_id(doc) -> [];
-script_id(suite) -> [];
 script_id(Config) when is_list(Config) ->
     ?line {Name, Vsn} = init:script_id(),
     ?line if
@@ -556,8 +519,6 @@ script_id(Config) when is_list(Config) ->
 %% Start the slave system with -boot flag.
 %% ------------------------------------------------
 
-boot1(doc) -> [];
-boot1(suite) -> {req, [distribution, {local_slave_nodes, 1}, {time, 35}]};
 boot1(Config) when is_list(Config) ->
     Args = args() ++ " -boot start_sasl",
     ?line {ok, Node} = start_node(init_test, Args),
@@ -569,8 +530,6 @@ boot1(Config) when is_list(Config) ->
 
     ok.
 
-boot2(doc) -> [];
-boot2(suite) -> {req, [distribution, {local_slave_nodes, 1}, {time, 35}]};
 boot2(Config) when is_list(Config) ->
     %% Absolute boot file name
     Boot = filename:join([code:root_dir(), "bin", "start_sasl"]),
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl
index 1cede1930a..7e724bb35e 100644
--- a/lib/kernel/test/interactive_shell_SUITE.erl
+++ b/lib/kernel/test/interactive_shell_SUITE.erl
@@ -72,8 +72,7 @@ end_per_group(_GroupName, Config) ->
 -define(dbg(Data),noop).
 -endif.
 
-get_columns_and_rows(suite) -> [];
-get_columns_and_rows(doc) -> ["Test that the shell can access columns and rows"];
+%% Test that the shell can access columns and rows.
 get_columns_and_rows(Config) when is_list(Config) ->
     case proplists:get_value(default_shell,Config) of
 	old ->
@@ -125,8 +124,7 @@ get_columns_and_rows(Config) when is_list(Config) ->
     
     
 
-exit_initial(suite) -> [];
-exit_initial(doc) -> ["Tests that exit of initial shell restarts shell"];
+%% Tests that exit of initial shell restarts shell.
 exit_initial(Config) when is_list(Config) ->
     case proplists:get_value(default_shell,Config) of
 	old ->
@@ -151,9 +149,7 @@ exit_initial(Config) when is_list(Config) ->
 		    {getline_re,"35"}],[])
     end.
 
-job_control_local(suite) -> [];
-job_control_local(doc) -> [ "Tests that local shell can be "
-			    "started by means of job control" ];
+%% Tests that local shell can be started by means of job control.
 job_control_local(Config) when is_list(Config) ->
     case proplists:get_value(default_shell,Config) of
 	old ->
@@ -178,7 +174,6 @@ job_control_local(Config) when is_list(Config) ->
 			  {getline,"35"}],[])
     end.
 
-job_control_remote(suite) -> [];
 job_control_remote(doc) -> [ "Tests that remote shell can be "
 			     "started by means of job control" ];
 job_control_remote(Config) when is_list(Config) ->
@@ -230,10 +225,9 @@ job_control_remote(Config) when is_list(Config) ->
 	    ?line Pid ! die,
 	    ?line Res
     end.
-job_control_remote_noshell(suite) -> [];
-job_control_remote_noshell(doc) -> 
-    [ "Tests that remote shell can be "
-      "started by means of job control to -noshell node" ];
+
+%% Tests that remote shell can be
+%% started by means of job control to -noshell node.
 job_control_remote_noshell(Config) when is_list(Config) ->
     case {node(),proplists:get_value(default_shell,Config)} of
 	{nonode@nohost,_} ->
@@ -286,8 +280,7 @@ job_control_remote_noshell(Config) when is_list(Config) ->
 	    ?line Res
     end.
 
-ctrl_keys(suite) -> [];
-ctrl_keys(doc) -> ["Tests various control keys"];
+%% Tests various control keys.
 ctrl_keys(_Conf) when is_list(_Conf) ->
     Cu=[$\^u],
     Cw=[$\^w],
diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl
index f95638e192..70493f818e 100644
--- a/lib/kernel/test/kernel_SUITE.erl
+++ b/lib/kernel/test/kernel_SUITE.erl
@@ -63,10 +63,7 @@ end_per_testcase(_Case, _Config) ->
 %
 % Test cases starts here.
 %
-app_test(doc) ->
-    ["Tests the applications consistency."];
-app_test(suite) ->
-    [];
+%% Tests the applications consistency.
 app_test(Config) when is_list(Config) ->
     ?line ok=?t:app_test(kernel),
     ok.
diff --git a/lib/kernel/test/kernel_config_SUITE.erl b/lib/kernel/test/kernel_config_SUITE.erl
index 13ab1ed8ba..a227c37cc8 100644
--- a/lib/kernel/test/kernel_config_SUITE.erl
+++ b/lib/kernel/test/kernel_config_SUITE.erl
@@ -42,13 +42,9 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-init_per_suite(doc) -> [];
-init_per_suite(suite) -> [];
 init_per_suite(Config) when is_list(Config) ->
     Config.
 
-end_per_suite(doc) -> [];
-end_per_suite(suite) -> [];
 end_per_suite(Config) when is_list(Config) ->
     stop_node(init_test),
     Config.
@@ -69,8 +65,6 @@ from(_, []) -> [].
 %% Should be started in a CC view with:
 %% erl -sname XXX where XX not in [cp1, cp2]
 %%-----------------------------------------------------------------
-sync(doc) -> [];
-sync(suite) -> [];
 sync(Conf) when is_list(Conf) ->
     % Write a config file
     Dir = proplists:get_value(priv_dir,Conf),
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index db63a3103e..f4d8dff55a 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -58,10 +58,8 @@ init_per_testcase(_TC,Config) ->
 end_per_testcase(_,_Config) ->
     ok.
 
-space_in_cwd(doc) ->
-    "Test that executing a command in a current working directory "
-	"with space in its name works.";
-space_in_cwd(suite) -> [];
+%% Test that executing a command in a current working directory
+%% with space in its name works.
 space_in_cwd(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     ?line Dirname = filename:join(PrivDir, "cwd with space"),
@@ -88,8 +86,7 @@ space_in_cwd(Config) when is_list(Config) ->
     ?line [] = receive_all(),
     ok.
 
-quoting(doc) -> "Test that various ways of quoting arguments work.";
-quoting(suite) -> [];
+%% Test that various ways of quoting arguments work.
 quoting(Config) when is_list(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
     ?line Echo = filename:join(DataDir, "my_echo"),
@@ -106,8 +103,7 @@ quoting(Config) when is_list(Config) ->
     ok.
 
 
-cmd_unicode(doc) -> "Test that unicode arguments work.";
-cmd_unicode(suite) -> [];
+%% Test that unicode arguments work.
 cmd_unicode(Config) when is_list(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
     ?line Echo = filename:join(DataDir, "my_echo"),
@@ -120,9 +116,7 @@ cmd_unicode(Config) when is_list(Config) ->
     ok.
 
 
-space_in_name(doc) ->
-    "Test that program with a space in its name can be executed.";
-space_in_name(suite) -> [];
+%% Test that program with a space in its name can be executed.
 space_in_name(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     DataDir = proplists:get_value(data_dir, Config),
@@ -162,9 +156,7 @@ space_in_name(Config) when is_list(Config) ->
     ?line [] = receive_all(),
     ok.
 
-bad_command(doc) ->
-    "Check that a bad command doesn't crasch the server or the emulator (it used to).";
-bad_command(suite) -> [];
+%% Check that a bad command doesn't crasch the server or the emulator (it used to).
 bad_command(Config) when is_list(Config) ->
     ?line catch os:cmd([a|b]),
     ?line catch os:cmd({bad, thing}),
@@ -175,8 +167,6 @@ bad_command(Config) when is_list(Config) ->
 
     ok.
 
-find_executable(suite) -> [];
-find_executable(doc) -> [];
 find_executable(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
@@ -250,9 +240,7 @@ find_exe(Where, Name, Ext, Path) ->
 	    ct:fail(failed)
     end.
 
-unix_comment_in_command(doc) ->
-    "OTP-1805: Test that os:cmd(\"ls #\") works correctly (used to hang).";
-unix_comment_in_command(suite) -> [];
+%% OTP-1805: Test that os:cmd(\ls #\) works correctly (used to hang).
 unix_comment_in_command(Config) when is_list(Config) ->
     Priv = proplists:get_value(priv_dir, Config),
     ?line ok = file:set_cwd(Priv),
@@ -261,9 +249,7 @@ unix_comment_in_command(Config) when is_list(Config) ->
     ?line [] = receive_all(),
     ok.
 
-deep_list_command(doc) ->
-    "Check that a deep list in command works equally on unix and on windows.";
-deep_list_command(suite) -> [];
+%% Check that a deep list in command works equally on unix and on windows.
 deep_list_command(Config) when is_list(Config) ->
     %% As a 'io_lib' module description says: "There is no guarantee that the
     %% character lists returned from some of the functions are flat, they can
@@ -275,10 +261,8 @@ deep_list_command(Config) when is_list(Config) ->
     %% FYI: [$e, $c, "ho"] =:= io_lib:format("ec~s", ["ho"])
     ok.
 
-large_output_command(doc) ->
-    "Test to take sure that the correct data is"
-    "received when doing large commands";
-large_output_command(suite) -> [];
+%% Test to take sure that the correct data is
+%% received when doing large commands.
 large_output_command(Config) when is_list(Config) ->
     %% Maximum allowed on windows is 8192, so we test well below that
     AAA = lists:duplicate(7000, $a),
diff --git a/lib/kernel/test/pdict_SUITE.erl b/lib/kernel/test/pdict_SUITE.erl
index 7e24b7b8ac..1f9348ab5c 100644
--- a/lib/kernel/test/pdict_SUITE.erl
+++ b/lib/kernel/test/pdict_SUITE.erl
@@ -67,10 +67,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-simple(doc) ->
-    ["Tests simple functionality in process dictionary."];
-simple(suite) ->
-    [];
+%% Tests simple functionality in process dictionary.
 simple(Config) when is_list(Config) ->
     XX = get(),
     ok = match_keys(XX),
@@ -145,10 +142,7 @@ comp_4([{{key,_}=K,{value,_}=Val}|T]) ->
     comp_4(T);
 comp_4([]) -> ok.
 
-heavy(doc) ->
-    ["Tests heavy usage of the process dictionary"];
-heavy(suite) ->
-    [];
+%% Tests heavy usage of the process dictionary.
 heavy(Config) when is_list(Config) ->
     XX = get(),
     erase(),
@@ -187,10 +181,7 @@ simple_all_keys_del_loop([K|Ks]) ->
     ok = match_keys(get()),
     simple_all_keys_del_loop(Ks).
 
-info(doc) ->
-    ["Tests process_info(Pid, dictionary)"];
-info(suite) ->
-    [];
+%% Tests process_info(Pid, dictionary).
 info(Config) when is_list(Config) ->
     L = [a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,
 	    q,r,s,t,u,v,x,y,z,'A','B','C','D'],
diff --git a/lib/kernel/test/pg2_SUITE.erl b/lib/kernel/test/pg2_SUITE.erl
index b42d37b459..04eb7feff7 100644
--- a/lib/kernel/test/pg2_SUITE.erl
+++ b/lib/kernel/test/pg2_SUITE.erl
@@ -72,9 +72,7 @@ end_per_group(_GroupName, Config) ->
 
 
 
-otp_7277(doc) ->
-    "OTP-7277. Bugfix leave().";
-otp_7277(suite) -> [];
+%% OTP-7277. Bugfix leave().
 otp_7277(Config) when is_list(Config) ->
     ?line ok = pg2:create(a),
     ?line ok = pg2:create(b),
@@ -97,9 +95,7 @@ otp_7277(Config) when is_list(Config) ->
 -define(UNTIL(Seq), loop_until_true(fun() -> Seq end, Config)).
 -define(UNTIL_LOOP, 300).
 
-otp_8653(suite) -> [];
-otp_8653(doc) ->
-    ["OTP-8259. Member was not removed after being killed."];
+%% OTP-8259. Member was not removed after being killed.
 otp_8653(Config) when is_list(Config) ->
     ?line [A, B, C] = start_nodes([a, b, c], peer, Config),
 
@@ -150,9 +146,7 @@ mk_part_node_and_group(File, MyPart0, Config) ->
     _ = [ok = pg2:join(G, Pid) || _ <- [1,1]],
     touch(File, "done").
 
-otp_8259(suite) -> [];
-otp_8259(doc) ->
-    ["OTP-8259. Member was not removed after being killed."];
+%% OTP-8259. Member was not removed after being killed.
 otp_8259(Config) when is_list(Config) ->
     ?line [A, B, C] = start_nodes([a, b, c], peer, Config),
 
@@ -224,9 +218,7 @@ loop() ->
 	    exit(normal)
     end.
 
-compat(suite) -> [];
-compat(doc) ->
-    ["OTP-8259. Check that 'exchange' and 'del_member' work."];
+%% OTP-8259. Check that 'exchange' and 'del_member' work.
 compat(Config) when is_list(Config) ->
     case ?t:is_release_available("r13b") of
         true ->
@@ -249,9 +241,7 @@ compat(Config) when is_list(Config) ->
 	    {skipped, "No support for old node"}
     end.
 
-basic(suite) -> [];
-basic(doc) ->
-    ["OTP-8259. Some basic tests."];
+%% OTP-8259. Some basic tests.
 basic(Config) when is_list(Config) ->
     _ = [pg2:delete(G) || G <- pg2:which_groups()],
     ?line _ = [do(Cs, T, Config) || {T,Cs} <- ts()],
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index ce00cdcead..5cef61e7cc 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -181,8 +181,6 @@ time_dist({_D1, _T1} = DT1, {_D2, _T2} = DT2) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-read_write_file(suite) -> [];
-read_write_file(doc) -> [];
 read_write_file(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -237,13 +235,9 @@ read_write_file(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-make_del_dir_a(suite) -> [];
-make_del_dir_a(doc) -> [];
 make_del_dir_a(Config) when is_list(Config) ->
     make_del_dir(Config, [], "_a").
 
-make_del_dir_b(suite) -> [];
-make_del_dir_b(doc) -> [];
 make_del_dir_b(Config) when is_list(Config) ->
     ?line {ok, Handle} = ?PRIM_FILE:start(),
     Result = make_del_dir(Config, Handle, "_b"),
@@ -312,13 +306,9 @@ make_del_dir(Config, Handle, Suffix) ->
     end,
     ok.
 
-cur_dir_0a(suite) -> [];
-cur_dir_0a(doc) -> [];
 cur_dir_0a(Config) when is_list(Config) ->
     cur_dir_0(Config, []).
 
-cur_dir_0b(suite) -> [];
-cur_dir_0b(doc) -> [];
 cur_dir_0b(Config) when is_list(Config) ->
     ?line {ok, Handle} = ?PRIM_FILE:start(),
     Result = cur_dir_0(Config, Handle),
@@ -396,13 +386,9 @@ cur_dir_0(Config, Handle) ->
 
 %% Tests ?PRIM_FILE:get_cwd/1.
 
-cur_dir_1a(suite) -> [];
-cur_dir_1a(doc) -> [];
 cur_dir_1a(Config) when is_list(Config) ->
     cur_dir_1(Config, []).
 
-cur_dir_1b(suite) -> [];
-cur_dir_1b(doc) -> [];
 cur_dir_1b(Config) when is_list(Config) ->
     ?line {ok, Handle} = ?PRIM_FILE:start(),
     Result = cur_dir_1(Config, Handle),
@@ -439,8 +425,6 @@ win_cur_dir_1(_Config, Handle) ->
 
 
 
-open1(suite) -> [];
-open1(doc) -> [];
 open1(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line NewDir = filename:join(RootDir, 
@@ -468,8 +452,6 @@ open1(Config) when is_list(Config) ->
 
 %% Tests all open modes.
 
-modes(suite) -> [];
-modes(doc) -> [];
 modes(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
@@ -510,8 +492,6 @@ modes(Config) when is_list(Config) ->
 
     ok.
 
-close(suite) -> [];
-close(doc) -> [];
 close(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -531,8 +511,6 @@ close(Config) when is_list(Config) ->
 
     ok.
 
-access(suite) -> [];
-access(doc) -> [];
 access(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -559,8 +537,6 @@ access(Config) when is_list(Config) ->
 
 %% Tests ?PRIM_FILE:read/2 and ?PRIM_FILE:write/2.
 
-read_write(suite) -> [];
-read_write(doc) -> [];
 read_write(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
@@ -587,8 +563,6 @@ read_write_test(File) ->
 
 %% Tests ?PRIM_FILE:pread/2 and ?PRIM_FILE:pwrite/2.
 
-pread_write(suite) -> [];
-pread_write(doc) -> [];
 pread_write(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
@@ -617,8 +591,7 @@ pread_write_test(File) ->
     ?line ok = ?PRIM_FILE:close(File),
     ok.
 
-append(doc) -> "Test appending to a file.";
-append(suite) -> [];
+%% Test appending to a file.
 append(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
@@ -648,8 +621,7 @@ append(Config) when is_list(Config) ->
 
     ok.
 
-exclusive(suite) -> [];
-exclusive(doc) -> "Test exclusive access to a file.";
+%% Test exclusive access to a file.
 exclusive(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line NewDir = filename:join(RootDir,
@@ -665,8 +637,6 @@ exclusive(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-pos1(suite) -> [];
-pos1(doc) -> [];
 pos1(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -726,8 +696,6 @@ pos1(Config) when is_list(Config) ->
     ?line {error, einval} = ?PRIM_FILE:position(Fd2,{eof,-9}),
     ok.
 
-pos2(suite) -> [];
-pos2(doc) -> [];
 pos2(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -748,13 +716,9 @@ pos2(Config) when is_list(Config) ->
     ok.
 
 
-file_info_basic_file_a(suite) -> [];
-file_info_basic_file_a(doc) -> [];
 file_info_basic_file_a(Config) when is_list(Config) ->
     file_info_basic_file(Config, [], "_a").
 
-file_info_basic_file_b(suite) -> [];
-file_info_basic_file_b(doc) -> [];
 file_info_basic_file_b(Config) when is_list(Config) ->
     ?line {ok, Handle} = ?PRIM_FILE:start(),
     Result = file_info_basic_file(Config, Handle, "_b"),
@@ -792,13 +756,9 @@ file_info_basic_file(Config, Handle, Suffix) ->
 
     ok.
 
-file_info_basic_directory_a(suite) -> [];
-file_info_basic_directory_a(doc) -> [];
 file_info_basic_directory_a(Config) when is_list(Config) ->
     file_info_basic_directory(Config, []).
 
-file_info_basic_directory_b(suite) -> [];
-file_info_basic_directory_b(doc) -> [];
 file_info_basic_directory_b(Config) when is_list(Config) ->
     ?line {ok, Handle} = ?PRIM_FILE:start(),
     Result = file_info_basic_directory(Config, Handle),
@@ -852,13 +812,9 @@ all_integers([]) ->
 
 %% Try something nonexistent.
 
-file_info_bad_a(suite) -> [];
-file_info_bad_a(doc) -> [];
 file_info_bad_a(Config) when is_list(Config) ->
     file_info_bad(Config, []).
 
-file_info_bad_b(suite) -> [];
-file_info_bad_b(doc) -> [];
 file_info_bad_b(Config) when is_list(Config) ->
     ?line {ok, Handle} = ?PRIM_FILE:start(),
     Result = file_info_bad(Config, Handle),
@@ -876,13 +832,9 @@ file_info_bad(Config, Handle) ->
 
 %% Test that the file times behave as they should.
 
-file_info_times_a(suite) -> [];
-file_info_times_a(doc) -> [];
 file_info_times_a(Config) when is_list(Config) ->
     file_info_times(Config, [], "_a").
 
-file_info_times_b(suite) -> [];
-file_info_times_b(doc) -> [];
 file_info_times_b(Config) when is_list(Config) ->
     ?line {ok, Handle} = ?PRIM_FILE:start(),
     Result = file_info_times(Config, Handle, "_b"),
@@ -972,13 +924,9 @@ filter_atime(Atime, Config) ->
 
 %% Test the write_file_info/2 function.
 
-file_write_file_info_a(suite) -> [];
-file_write_file_info_a(doc) -> [];
 file_write_file_info_a(Config) when is_list(Config) ->
     file_write_file_info(Config, [], "_a").
 
-file_write_file_info_b(suite) -> [];
-file_write_file_info_b(doc) -> [];
 file_write_file_info_b(Config) when is_list(Config) ->
     ?line {ok, Handle} = ?PRIM_FILE:start(),
     Result = file_write_file_info(Config, Handle, "_b"),
@@ -1058,8 +1006,6 @@ file_write_file_info(Config, Handle, Suffix) ->
 
 %% Test the write_file_info/3 function.
 
-file_write_file_info_opts(suite) -> [];
-file_write_file_info_opts(doc) -> [];
 file_write_file_info_opts(Config) when is_list(Config) ->
     {ok, Handle} = ?PRIM_FILE:start(),
     RootDir = get_good_directory(Config),
@@ -1097,8 +1043,6 @@ file_write_file_info_opts(Config) when is_list(Config) ->
     ok   = ?PRIM_FILE:stop(Handle),
     ok.
 
-file_read_file_info_opts(suite) -> [];
-file_read_file_info_opts(doc) -> [];
 file_read_file_info_opts(Config) when is_list(Config) ->
     {ok, Handle} = ?PRIM_FILE:start(),
     RootDir = get_good_directory(Config),
@@ -1116,8 +1060,6 @@ file_read_file_info_opts(Config) when is_list(Config) ->
 
 %% Test the write and read back *_file_info/3 functions.
 
-file_write_read_file_info_opts(suite) -> [];
-file_write_read_file_info_opts(doc) -> [];
 file_write_read_file_info_opts(Config) when is_list(Config) ->
     {ok, Handle} = ?PRIM_FILE:start(),
     RootDir = get_good_directory(Config),
@@ -1153,8 +1095,6 @@ file_write_read_file_info_opts(Handle, Name, Mtime, Opts) ->
 get_good_directory(Config) ->
     proplists:get_value(priv_dir, Config).
 
-truncate(suite) -> [];
-truncate(doc) -> [];
 truncate(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
@@ -1184,8 +1124,7 @@ truncate(Config) when is_list(Config) ->
     ok.
 
 
-datasync(suite) -> [];
-datasync(doc) -> "Tests that ?PRIM_FILE:datasync/1 at least doesn't crash.";
+%% Tests that ?PRIM_FILE:datasync/1 at least doesn't crash.
 datasync(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     ?line Sync = filename:join(PrivDir,
@@ -1200,8 +1139,7 @@ datasync(Config) when is_list(Config) ->
     ok.
 
 
-sync(suite) -> [];
-sync(doc) -> "Tests that ?PRIM_FILE:sync/1 at least doesn't crash.";
+%% Tests that ?PRIM_FILE:sync/1 at least doesn't crash.
 sync(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     ?line Sync = filename:join(PrivDir, 
@@ -1216,8 +1154,7 @@ sync(Config) when is_list(Config) ->
     ok.
 
 
-advise(suite) -> [];
-advise(doc) -> "Tests that ?PRIM_FILE:advise/4 at least doesn't crash.";
+%% Tests that ?PRIM_FILE:advise/4 at least doesn't crash.
 advise(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     ?line Advise = filename:join(PrivDir,
@@ -1320,8 +1257,7 @@ check_large_write(Fd, _, _, []) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-allocate(suite) -> [];
-allocate(doc) -> "Tests that ?PRIM_FILE:allocate/3 at least doesn't crash.";
+%% Tests that ?PRIM_FILE:allocate/3 at least doesn't crash.
 allocate(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     ?line Allocate = filename:join(PrivDir,
@@ -1388,13 +1324,9 @@ allocate_and_assert(Fd, Offset, Length) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-delete_a(suite) -> [];
-delete_a(doc) -> [];
 delete_a(Config) when is_list(Config) ->
     delete(Config, [], "_a").
 
-delete_b(suite) -> [];
-delete_b(doc) -> [];
 delete_b(Config) when is_list(Config) ->
     ?line {ok, Handle} = ?PRIM_FILE:start(),
     Result = delete(Config, Handle, "_b"),
@@ -1419,13 +1351,9 @@ delete(Config, Handle, Suffix) ->
     ?line {error, enoent} = ?PRIM_FILE_call(delete, Handle, [Name]),
     ok.
 
-rename_a(suite) ->[];
-rename_a(doc) ->[];
 rename_a(Config) when is_list(Config) ->
     rename(Config, [], "_a").
 
-rename_b(suite) ->[];
-rename_b(doc) ->[];
 rename_b(Config) when is_list(Config) ->
     ?line {ok, Handle} = ?PRIM_FILE:start(),
     Result = rename(Config, Handle, "_b"),
@@ -1492,8 +1420,6 @@ rename(Config, Handle, Suffix) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-e_delete(suite) -> [];
-e_delete(doc) -> [];
 e_delete(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line Base = filename:join(RootDir, 
@@ -1536,8 +1462,6 @@ e_delete(Config) when is_list(Config) ->
 %%% (What about FreeBSD? We store our nightly build results on a FreeBSD
 %%% file system, that's what.)
 
-e_rename(suite) -> [];
-e_rename(doc) -> [];
 e_rename(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line Base = filename:join(RootDir,
@@ -1637,8 +1561,6 @@ e_rename(Config) when is_list(Config) ->
     end,
     Comment.
 
-e_make_dir(suite) -> [];
-e_make_dir(doc) -> [];
 e_make_dir(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line Base = filename:join(RootDir, 
@@ -1671,8 +1593,6 @@ e_make_dir(Config) when is_list(Config) ->
     end,
     ok.
 
-e_del_dir(suite) -> [];
-e_del_dir(doc) -> [];
 e_del_dir(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     ?line Base = filename:join(RootDir, 
@@ -1726,8 +1646,6 @@ e_del_dir(Config) when is_list(Config) ->
 
 %% Trying reading and positioning from a compressed file.
 
-read_compressed(suite) -> [];
-read_compressed(doc) -> [];
 read_compressed(Config) when is_list(Config) ->
     Data = proplists:get_value(data_dir, Config),
     ?line Real = filename:join(Data, "realmen.html.gz"),
@@ -1737,8 +1655,6 @@ read_compressed(Config) when is_list(Config) ->
 %% Trying reading and positioning from an uncompressed file,
 %% but with the compressed flag given.
 
-read_not_really_compressed(suite) -> [];
-read_not_really_compressed(doc) -> [];
 read_not_really_compressed(Config) when is_list(Config) ->
     Data = proplists:get_value(data_dir, Config),
     Priv = proplists:get_value(priv_dir, Config),
@@ -1800,8 +1716,6 @@ try_read_file(Fd) ->
     ?line ?PRIM_FILE:close(Fd),
     ok.
 
-write_compressed(suite) -> [];
-write_compressed(doc) -> [];
 write_compressed(Config) when is_list(Config) ->
     Priv = proplists:get_value(priv_dir, Config),
     ?line MyFile = filename:join(Priv, 
@@ -1848,8 +1762,6 @@ write_compressed(Config) when is_list(Config) ->
 
     ok.
 
-compress_errors(suite) -> [];
-compress_errors(doc) -> [];
 compress_errors(Config) when is_list(Config) ->
     Data = proplists:get_value(data_dir, Config),
     ?line {error, enoent} = ?PRIM_FILE:open("non_existing__",
@@ -1867,13 +1779,11 @@ compress_errors(Config) when is_list(Config) ->
     ok.
 
 
-make_link_a(doc) -> "Test creating a hard link.";
-make_link_a(suite) -> [];
+%% Test creating a hard link.
 make_link_a(Config) when is_list(Config) ->
     make_link(Config, [], "_a").
 
-make_link_b(doc) -> "Test creating a hard link.";
-make_link_b(suite) -> [];
+%% Test creating a hard link.
 make_link_b(Config) when is_list(Config) ->
     ?line {ok, Handle} = ?PRIM_FILE:start(),
     Result = make_link(Config, Handle, "_b"),
@@ -1914,21 +1824,17 @@ make_link(Config, Handle, Suffix) ->
     
     Result.
 
-read_link_info_for_non_link(doc) ->
-    "Test that reading link info for an ordinary file or directory works "
-	"(on all platforms).";
-read_link_info_for_non_link(suite) -> [];
+%% Test that reading link info for an ordinary file or directory works
+%% (on all platforms).
 read_link_info_for_non_link(Config) when is_list(Config) ->
     ?line {ok, #file_info{type=directory}} = ?PRIM_FILE:read_link_info("."),
     ok.
     
-symlinks_a(doc) -> "Test operations on symbolic links (for Unix).";
-symlinks_a(suite) -> [];
+%% Test operations on symbolic links (for Unix).
 symlinks_a(Config) when is_list(Config) ->
     symlinks(Config, [], "_a").
 
-symlinks_b(doc) -> "Test operations on symbolic links (for Unix).";
-symlinks_b(suite) -> [];
+%% Test operations on symbolic links (for Unix).
 symlinks_b(Config) when is_list(Config) ->
     ?line {ok, Handle} = ?PRIM_FILE:start(),
     Result = symlinks(Config, Handle, "_b"),
@@ -1980,10 +1886,7 @@ symlinks(Config, Handle, Suffix) ->
 %% periodically calls list_dir/2 to check if it works,
 %% then deletes all files.
 
-list_dir_limit(doc) ->
-    "Tests if large directories can be read";
-list_dir_limit(suite) ->
-    [];
+%% Tests if large directories can be read.
 list_dir_limit(Config) when is_list(Config) ->
     ?line MaxTime = 120, 
     ?line MaxNumber = 20000, 
diff --git a/lib/kernel/test/ram_file_SUITE.erl b/lib/kernel/test/ram_file_SUITE.erl
index 96bd9a02c6..f6d02c67eb 100644
--- a/lib/kernel/test/ram_file_SUITE.erl
+++ b/lib/kernel/test/ram_file_SUITE.erl
@@ -71,10 +71,7 @@ end_per_testcase(_Func, Config) ->
 %%--------------------------------------------------------------------------
 %% Test suites
 
-open_modes(suite) ->
-    [];
-open_modes(doc) ->
-    ["Test that the basic read, write and binary options works for open/2."];
+%% Test that the basic read, write and binary options works for open/2.
 open_modes(Config) when is_list(Config) ->
     ?line Str1 = "The quick brown fox ",
     ?line Str2 = "jumps over a lazy dog ",
@@ -90,11 +87,8 @@ open_modes(Config) when is_list(Config) ->
     %%
     ok.
 
-open_old_modes(suite) ->
-    [];
-open_old_modes(doc) ->
-    ["Test that the old style read, write and binary options ", 
-     "works for open/2."];
+%% Test that the old style read, write and binary options
+%% works for open/2.
 open_old_modes(Config) when is_list(Config) ->
     ?line Str1 = "The quick brown fox ",
     ?line Str2 = "jumps over a lazy dog ",
@@ -155,10 +149,7 @@ open_read(Module, Data, Options) ->
 
 
 
-pread_pwrite(suite) ->
-    [];
-pread_pwrite(doc) ->
-    ["Test that pread/2,3 and pwrite/2,3 works."];
+%% Test that pread/2,3 and pwrite/2,3 works.
 pread_pwrite(Config) when is_list(Config) ->
     ?line Str = "Flygande bäckaziner söka hwila på mjuqa tuvor x",
     ?line Bin = list_to_binary(Str),
@@ -194,10 +185,7 @@ pread_pwrite_test(Module, Data, Options) ->
     %%
     ?line ok.
 
-position(suite) ->
-    [];
-position(doc) ->
-    ["Test that position/2 works."];
+%% Test that position/2 works.
 position(Config) when is_list(Config) ->
     ?line Str = "Att vara eller icke vara, det är frågan. ",
     ?line Bin = list_to_binary(Str),
@@ -275,10 +263,7 @@ position_test(Module, Data, Options) ->
 
 
 
-truncate(suite) ->
-    [];
-truncate(doc) ->
-    ["Test that truncate/1 works."];
+%% Test that truncate/1 works.
 truncate(Config) when is_list(Config) ->
     ?line Str = "Mån ädlare att lida och fördraga "
 	++ "ett bittert ödes stygn av pilar, ",
@@ -319,10 +304,7 @@ truncate_test(Module, Data, Options) ->
 
 
 
-sync(suite) ->
-    [];
-sync(doc) ->
-    ["Test that sync/1 at least does not crash."];
+%% Test that sync/1 at least does not crash.
 sync(Config) when is_list(Config) ->
     ?line Str = "än att ta till vapen mot ett hav av kval. ",
     ?line Bin = list_to_binary(Str),
@@ -352,10 +334,7 @@ sync_test(Module, Data, Options) ->
 
 
 
-get_set_file(suite) ->
-    [];
-get_set_file(doc) ->
-    ["Tests get_file/1, set_file/2, get_file_close/1 and get_size/1."];
+%% Tests get_file/1, set_file/2, get_file_close/1 and get_size/1.
 get_set_file(Config) when is_list(Config) ->
     %% These two strings should not be of equal length.
     ?line Str  = "När högan nord blir snöbetäckt, ",
@@ -396,10 +375,7 @@ get_set_file_test(Data, Options, Data2) ->
     
 
     
-compress(suite) ->
-    [];
-compress(doc) ->
-    ["Test that compress/1 and uncompress/1 works."];
+%% Test that compress/1 and uncompress/1 works.
 compress(Config) when is_list(Config) ->
     Data   = proplists:get_value(data_dir, Config),
     ?line Real   = filename:join(Data, "realmen.html"),
@@ -461,10 +437,7 @@ mk_42(N) ->
     B = mk_42(N-1),
     [B|B].
 
-uuencode(suite) ->
-    [];
-uuencode(doc) ->
-    ["Test that uuencode/1 and uudecode/1 works."];
+%% Test that uuencode/1 and uudecode/1 works.
 uuencode(Config) when is_list(Config) ->
     Data   = proplists:get_value(data_dir, Config),
     ?line Real   = filename:join(Data, "realmen.html"),
@@ -506,10 +479,7 @@ uuencode(Config) when is_list(Config) ->
     ok.
 
 
-large_file_errors(suite) ->
-    [];
-large_file_errors(doc) ->
-    ["Test error checking of large file offsets."];
+%% Test error checking of large file offsets.
 large_file_errors(Config) when is_list(Config) ->
     ?line TwoGig = 1 bsl 31,
     ?line {ok,Fd}         = ?RAM_FILE_MODULE:open("1234567890", [read,write]),
@@ -536,10 +506,7 @@ large_file_errors(Config) when is_list(Config) ->
 
 
 
-large_file_light(suite) ->
-    [];
-large_file_light(doc) ->
-    ["Test light operations on a \"large\" ram_file."];
+%% Test light operations on a \large\ ram_file.
 large_file_light(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     %% Marker for next test case that is to heavy to run in a suite.
@@ -569,10 +536,7 @@ large_file_light(Config) when is_list(Config) ->
 large_file_heavy() ->
     [{timetrap,{minutes,5}}].
 
-large_file_heavy(suite) ->
-    [];
-large_file_heavy(doc) ->
-    ["Test operations on a maximum size (2 GByte - 1) ram_file."];
+%% Test operations on a maximum size (2 GByte - 1) ram_file.
 large_file_heavy(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     %% Check previous test case marker.
diff --git a/lib/kernel/test/rpc_SUITE.erl b/lib/kernel/test/rpc_SUITE.erl
index 0b03079c37..bfd55f3b1a 100644
--- a/lib/kernel/test/rpc_SUITE.erl
+++ b/lib/kernel/test/rpc_SUITE.erl
@@ -57,7 +57,7 @@ end_per_group(_GroupName, Config) ->
 
 
 
-call(doc) -> "Test different rpc calls";
+%% Test different rpc calls.
 call(Config) when is_list(Config) ->
     ?line PA = filename:dirname(code:which(?MODULE)),
     %% Note. First part of nodename sets response delay in seconds
@@ -82,7 +82,7 @@ call(Config) when is_list(Config) ->
     ?line ?t:stop_node(N4),
     ok.
 
-block_call(doc) -> "Test different rpc calls";
+%% Test different rpc calls.
 block_call(Config) when is_list(Config) ->
     ?line PA = filename:dirname(code:which(?MODULE)),
     %% Note. First part of nodename sets response delay in seconds
@@ -108,8 +108,7 @@ block_call(Config) when is_list(Config) ->
     ok.
 
 
-multicall(doc) ->
-    "OTP-3449";
+%% OTP-3449.
 multicall(Config) when is_list(Config) ->
     ?line PA = filename:dirname(code:which(?MODULE)),
     %% Note. First part of nodename sets response delay in seconds
@@ -197,8 +196,6 @@ do_multicall(Nodes, Mod, Func, Args) ->
 
 
 
-multicall_node_dies(doc) ->    
-    "";
 multicall_node_dies(Config) when is_list(Config) ->
     do_multicall_2_nodes_dies(?MODULE, suicide, [erlang, halt, []]),
     do_multicall_2_nodes_dies(?MODULE, suicide, [init, stop, []]),
@@ -220,8 +217,7 @@ do_multicall_2_nodes_dies(Mod, Func, Args) ->
 
 
 
-called_dies(doc) ->
-    "OTP-3766";
+%% OTP-3766.
 called_dies(Config) when is_list(Config) ->
     ?line PA = filename:dirname(code:which(?MODULE)),
     ?line {ok, N} = ?t:start_node(rpc_SUITE_called_dies, slave, 
@@ -350,9 +346,6 @@ suicide(Mod, Func, Args) ->
 
 
 
-called_node_dies(doc) ->
-    "";
-called_node_dies(suite) -> [];
 called_node_dies(Config) when is_list(Config) ->
     ?line PA = filename:dirname(code:which(?MODULE)),
     %%
@@ -415,8 +408,7 @@ node_rep(Fun, Name, PA, M, F, A) ->
 
 
 
-called_throws(doc) ->
-    "OTP-3766";
+%% OTP-3766.
 called_throws(Config) when is_list(Config) ->
     ?line PA = filename:dirname(code:which(?MODULE)),
     %%
diff --git a/lib/kernel/test/seq_trace_SUITE.erl b/lib/kernel/test/seq_trace_SUITE.erl
index 8a7de22f45..65a62a5a10 100644
--- a/lib/kernel/test/seq_trace_SUITE.erl
+++ b/lib/kernel/test/seq_trace_SUITE.erl
@@ -74,8 +74,6 @@ end_per_testcase(_Case, _Config) ->
 
 %% Verifies that the set_token and get_token functions work as expected
 
-token_set_get(doc) -> [];
-token_set_get(suite) -> [];
 token_set_get(Config) when is_list(Config) ->
     do_token_set_get(timestamp),
     do_token_set_get(monotonic_timestamp),
@@ -131,8 +129,6 @@ do_token_set_get(TsType) ->
     ?line seq_trace:reset_trace(),
     ok.
 
-tracer_set_get(doc) -> [];
-tracer_set_get(suite) -> [];
 tracer_set_get(Config) when is_list(Config) ->
     ?line Self = self(),
     ?line seq_trace:set_system_tracer(self()),
@@ -149,8 +145,6 @@ tracer_set_get(Config) when is_list(Config) ->
     ?line false = seq_trace:get_system_tracer(),
     ok.
 
-print(doc) -> [];
-print(suite) -> [];
 print(Config) when is_list(Config) ->
     lists:foreach(fun do_print/1, ?TIMESTAMP_MODES).
     
@@ -166,8 +160,6 @@ do_print(TsType) ->
     check_ts(TsType, Ts0),
     check_ts(TsType, Ts1).
     
-send(doc) -> [];
-send(suite) -> [];
 send(Config) when is_list(Config) ->
     lists:foreach(fun do_send/1, ?TIMESTAMP_MODES).
 
@@ -182,8 +174,6 @@ do_send(TsType) ->
     ?line [{0,{send,_,Self,Receiver,send}, Ts}] = stop_tracer(1),
     check_ts(TsType, Ts).
 
-distributed_send(doc) -> [];
-distributed_send(suite) -> [];
 distributed_send(Config) when is_list(Config) ->
     lists:foreach(fun do_distributed_send/1, ?TIMESTAMP_MODES).
 
@@ -204,8 +194,6 @@ do_distributed_send(TsType) ->
     check_ts(TsType, Ts).
     
 
-recv(doc) -> [];
-recv(suite) -> [];
 recv(Config) when is_list(Config) ->
     lists:foreach(fun do_recv/1, ?TIMESTAMP_MODES).
 
@@ -222,8 +210,6 @@ do_recv(TsType) ->
     ?line [{0,{'receive',_,Self,Receiver,'receive'}, Ts}] = stop_tracer(1),
     check_ts(TsType, Ts).
 
-distributed_recv(doc) -> [];
-distributed_recv(suite) -> [];
 distributed_recv(Config) when is_list(Config) ->
     lists:foreach(fun do_distributed_recv/1, ?TIMESTAMP_MODES).
 
@@ -247,8 +233,6 @@ do_distributed_recv(TsType) ->
     ?line [{0,{'receive',_,Self,Receiver,'receive'}, Ts}] = Result,
     check_ts(TsType, Ts).
 
-trace_exit(doc) -> [];
-trace_exit(suite) -> [];
 trace_exit(Config) when is_list(Config) ->
     lists:foreach(fun do_trace_exit/1, ?TIMESTAMP_MODES).
 
@@ -277,8 +261,6 @@ do_trace_exit(TsType) ->
     check_ts(TsType, Ts0),
     check_ts(TsType, Ts1).
 
-distributed_exit(doc) -> [];
-distributed_exit(suite) -> [];
 distributed_exit(Config) when is_list(Config) ->
     lists:foreach(fun do_distributed_exit/1, ?TIMESTAMP_MODES).
 
@@ -313,8 +295,6 @@ do_distributed_exit(TsType) ->
 call(doc) -> 
     "Tests special forms {is_seq_trace} and {get_seq_token} "
 	"in trace match specs.";
-call(suite) -> 
-    [];
 call(Config) when is_list(Config) ->
     ?line Self = self(),
     ?line seq_trace:reset_trace(),
@@ -401,9 +381,7 @@ call(Config) when is_list(Config) ->
     ?line seq_trace:reset_trace(),
     ok.
 
-port(doc) ->
-    "Send trace messages to a port.";
-port(suite) -> [];
+%% Send trace messages to a port.
 port(Config) when is_list(Config) ->
     lists:foreach(fun (TsType) -> do_port(TsType, Config) end,
 		  ?TIMESTAMP_MODES).
@@ -470,8 +448,6 @@ get_port_message(Port) ->
 
 
 
-match_set_seq_token(suite) ->
-    [];
 match_set_seq_token(doc) ->
     ["Tests that match spec function set_seq_token does not "
      "corrupt the heap"];
@@ -617,8 +593,6 @@ bounce(Ref) ->
 
 
 
-gc_seq_token(suite) ->
-    [];
 gc_seq_token(doc) ->
     ["Tests that a seq_trace token on a message in the inqueue ",
      "can be garbage collected."];
diff --git a/lib/kernel/test/wrap_log_reader_SUITE.erl b/lib/kernel/test/wrap_log_reader_SUITE.erl
index 40b11ba0c7..db41c14be9 100644
--- a/lib/kernel/test/wrap_log_reader_SUITE.erl
+++ b/lib/kernel/test/wrap_log_reader_SUITE.erl
@@ -79,8 +79,7 @@ init_per_testcase(Func, Config) ->
 end_per_testcase(_Func, _Config) ->
     ok.
 
-no_file(suite) -> [];
-no_file(doc) -> ["No log file exists"];
+%% No log file exists.
 no_file(Conf) when is_list(Conf) ->
     code:add_path(proplists:get_value(data_dir,Conf)),
     Dir = ?privdir(Conf),
@@ -100,8 +99,7 @@ no_file(Conf) when is_list(Conf) ->
     ok.
 
 
-one_empty(suite) -> [];
-one_empty(doc) -> ["One empty index file"];
+%% One empty index file.
 one_empty(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
@@ -126,8 +124,7 @@ one_empty(Conf) when is_list(Conf) ->
     delete_files(File),
     ok.
 
-one_filled(suite) -> [];
-one_filled(doc) -> ["One filled index file"];
+%% One filled index file.
 one_filled(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
@@ -161,8 +158,7 @@ test_one(File) ->
     ok.
 
 
-two_filled(suite) -> [];
-two_filled(doc) -> ["Two filled index files"];
+%% Two filled index files.
 two_filled(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = list_to_atom(join(Dir, "sune.LOG")),
@@ -201,8 +197,7 @@ test_two(File) ->
     ok.
 
 
-four_filled(suite) -> [];
-four_filled(doc) -> ["Four filled index files"];
+%% Four filled index files.
 four_filled(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
@@ -244,8 +239,7 @@ test_four(File) ->
     ok.
 
 
-wrap_filled(suite) -> [];
-wrap_filled(doc) -> ["First wrap, open, filled index file"];
+%% First wrap, open, filled index file.
 wrap_filled(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
@@ -287,8 +281,7 @@ test_wrap(File) ->
 		    {chunk, 2, ["first round, 42"]}, eof], wlt, ?LINE),
     ok.
 
-wrapping(suite) -> [];
-wrapping(doc) -> ["Wrapping at the same time as reading"];
+%% Wrapping at the same time as reading.
 wrapping(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
@@ -342,8 +335,7 @@ wrapping(Conf) when is_list(Conf) ->
     delete_files(File),
     ok.
 
-external(suite) -> [];
-external(doc) -> ["External format"];
+%% External format.
 external(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
@@ -362,8 +354,7 @@ external(Conf) when is_list(Conf) ->
     delete_files(File),
     ok.
 
-error(suite) -> [];
-error(doc) -> ["Error situations"];
+%% Error situations.
 error(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl
index 0ef95ab176..1b8105d51a 100644
--- a/lib/kernel/test/zlib_SUITE.erl
+++ b/lib/kernel/test/zlib_SUITE.erl
@@ -107,8 +107,7 @@ end_per_group(_GroupName, Config) ->
 
 
 
-api_open_close(doc) -> "Test open/0 and close/1";
-api_open_close(suite) -> [];
+%% Test open/0 and close/1.
 api_open_close(Config) when is_list(Config) ->
     ?line Fd1 = zlib:open(),
     ?line Fd2 = zlib:open(),
@@ -126,8 +125,7 @@ api_open_close(Config) when is_list(Config) ->
     after 10 -> ok
     end.
 
-api_deflateInit(doc) -> "Test deflateInit/2 and /6";
-api_deflateInit(suite) -> [];
+%% Test deflateInit/2 and /6.
 api_deflateInit(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     ?m(?BARG, zlib:deflateInit(gurka, none)),
@@ -188,8 +186,7 @@ api_deflateInit(Config) when is_list(Config) ->
     ?m({'EXIT',_}, zlib:deflateInit(Z1,none,deflated,-15,8,default)), %% ?? 
     ?m(ok, zlib:close(Z1)).
 
-api_deflateSetDictionary(doc) -> "Test deflateSetDictionary";
-api_deflateSetDictionary(suite) -> [];
+%% Test deflateSetDictionary.
 api_deflateSetDictionary(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1, default)),
@@ -201,8 +198,7 @@ api_deflateSetDictionary(Config) when is_list(Config) ->
     ?m({'EXIT',{stream_error,_}},zlib:deflateSetDictionary(Z1,<<1,1,2,3,4,5,1>>)),
     ?m(ok, zlib:close(Z1)).
 
-api_deflateReset(doc) -> "Test deflateReset";
-api_deflateReset(suite) -> [];
+%% Test deflateReset.
 api_deflateReset(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1, default)),
@@ -212,8 +208,7 @@ api_deflateReset(Config) when is_list(Config) ->
     %% FIXME how do I make this go wrong??
     ?m(ok, zlib:close(Z1)).
 
-api_deflateParams(doc) -> "Test deflateParams";
-api_deflateParams(suite) -> [];
+%% Test deflateParams.
 api_deflateParams(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1, default)),
@@ -222,8 +217,7 @@ api_deflateParams(Config) when is_list(Config) ->
     ?m(_, zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, sync)),
     ?m(ok, zlib:close(Z1)).
 
-api_deflate(doc) -> "Test deflate";
-api_deflate(suite) -> [];
+%% Test deflate.
 api_deflate(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1, default)),
@@ -245,8 +239,7 @@ api_deflate(Config) when is_list(Config) ->
     
     ?m(ok, zlib:close(Z1)).
 
-api_deflateEnd(doc) -> "Test deflateEnd";
-api_deflateEnd(suite) -> [];
+%% Test deflateEnd.
 api_deflateEnd(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1, default)),
@@ -263,8 +256,7 @@ api_deflateEnd(Config) when is_list(Config) ->
     
     ?m(ok, zlib:close(Z1)).
 
-api_inflateInit(doc) -> "Test inflateInit /1 and /2";
-api_inflateInit(suite) -> [];
+%% Test inflateInit /1 and /2.
 api_inflateInit(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     ?m(?BARG, zlib:inflateInit(gurka)),
@@ -285,8 +277,7 @@ api_inflateInit(Config) when is_list(Config) ->
     ?m(?BARG, zlib:inflateInit(Z1, -16)),
     ?m(ok, zlib:close(Z1)).
 
-api_inflateSetDictionary(doc) -> "Test inflateSetDictionary";
-api_inflateSetDictionary(suite) -> [];
+%% Test inflateSetDictionary.
 api_inflateSetDictionary(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     ?m(ok, zlib:inflateInit(Z1)),
@@ -297,8 +288,7 @@ api_inflateSetDictionary(Config) when is_list(Config) ->
     ?m({'EXIT',{stream_error,_}}, zlib:inflateSetDictionary(Z1,Dict)),
     ?m(ok, zlib:close(Z1)).
 
-api_inflateSync(doc) -> "Test inflateSync";
-api_inflateSync(suite) -> [];
+%% Test inflateSync.
 api_inflateSync(Config) when is_list(Config) ->
     {skip,"inflateSync/1 sucks"}.
 %%     ?line Z1 = zlib:open(),
@@ -328,8 +318,7 @@ clobber(N, Bin) when is_binary(Bin) ->
 	   end,
     list_to_binary(tuple_to_list(setelement(N, T, Byte))).
 
-api_inflateReset(doc) -> "Test inflateReset";
-api_inflateReset(suite) -> [];
+%% Test inflateReset.
 api_inflateReset(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     ?m(ok, zlib:inflateInit(Z1)),
@@ -337,8 +326,7 @@ api_inflateReset(Config) when is_list(Config) ->
     ?m(ok, zlib:inflateReset(Z1)),
     ?m(ok, zlib:close(Z1)).
 
-api_inflate(doc) -> "Test inflate";
-api_inflate(suite) -> [];
+%% Test inflate.
 api_inflate(Config) when is_list(Config) ->
     Data = [<<1,2,2,3,3,3,4,4,4,4>>],
     ?line Compressed = zlib:compress(Data),
@@ -357,8 +345,7 @@ api_inflate(Config) when is_list(Config) ->
     ?m({'EXIT',{data_error,_}}, zlib:inflate(Z1, <<2,1,2,1,2>>)), 
     ?m(ok, zlib:close(Z1)).
 
-api_inflateChunk(doc) -> "Test inflateChunk";
-api_inflateChunk(suite) -> [];
+%% Test inflateChunk.
 api_inflateChunk(Config) when is_list(Config) ->
     ChunkSize = 1024,
     Data = << <<(I rem 150)>> || I <- lists:seq(1, 3 * ChunkSize) >>,
@@ -390,8 +377,7 @@ api_inflateChunk(Config) when is_list(Config) ->
     ?m({'EXIT',{data_error,_}}, zlib:inflateEnd(Z1)),
     ?m(ok, zlib:close(Z1)).
 
-api_inflateEnd(doc) -> "Test inflateEnd";
-api_inflateEnd(suite) -> [];
+%% Test inflateEnd.
 api_inflateEnd(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     ?m({'EXIT',{einval,_}}, zlib:inflateEnd(Z1)), 
@@ -404,16 +390,14 @@ api_inflateEnd(Config) when is_list(Config) ->
     ?m(ok, zlib:inflateEnd(Z1)),
     ?m(ok, zlib:close(Z1)).
 
-api_getBufsz(doc) -> "Test getBufsz";
-api_getBufsz(suite) -> [];
+%% Test getBufsz.
 api_getBufsz(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     ?m(Val when is_integer(Val), zlib:getBufSize(Z1)),
     ?m(?BARG, zlib:getBufSize(gurka)),
     ?m(ok, zlib:close(Z1)).
 
-api_setBufsz(doc) -> "Test setBufsz";
-api_setBufsz(suite) -> [];
+%% Test setBufsz.
 api_setBufsz(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     ?m(?BARG, zlib:setBufSize(Z1, gurka)),
@@ -425,8 +409,7 @@ api_setBufsz(Config) when is_list(Config) ->
     ?m(ok, zlib:close(Z1)).
 
 %%% Debug function ??
-api_getQSize(doc) -> "Test getQSize";
-api_getQSize(suite) -> [];
+%% Test getQSize.
 api_getQSize(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     Q = ?m(Val when is_integer(Val), zlib:getQSize(Z1)),
@@ -434,8 +417,7 @@ api_getQSize(Config) when is_list(Config) ->
     ?m(?BARG, zlib:getQSize(gurka)),
     ?m(ok, zlib:close(Z1)).
 
-api_crc32(doc) -> "Test crc32";
-api_crc32(suite) -> [];
+%% Test crc32.
 api_crc32(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1,best_speed,deflated,-15,8,default)),
@@ -461,8 +443,7 @@ api_crc32(Config) when is_list(Config) ->
     ?m(ok, zlib:deflateEnd(Z1)),
     ?m(ok, zlib:close(Z1)).    
 
-api_adler32(doc) -> "Test adler32";
-api_adler32(suite) -> [];
+%% Test adler32.
 api_adler32(Config) when is_list(Config) ->
     ?line Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1,best_speed,deflated,-15,8,default)),
@@ -485,8 +466,7 @@ api_adler32(Config) when is_list(Config) ->
     ?m(ok, zlib:deflateEnd(Z1)),
     ?m(ok, zlib:close(Z1)).    
 
-api_un_compress(doc) -> "Test compress";
-api_un_compress(suite) -> [];
+%% Test compress.
 api_un_compress(Config) when is_list(Config) ->
     ?m(?BARG,zlib:compress(not_a_binary)),
     Bin = <<1,11,1,23,45>>,
@@ -502,8 +482,7 @@ api_un_compress(Config) when is_list(Config) ->
     ?m(Bin, zlib:uncompress(binary_to_list(Comp))),
     ?m(Bin, zlib:uncompress(Comp)).
 
-api_un_zip(doc) -> "Test zip";
-api_un_zip(suite) -> [];
+%% Test zip.
 api_un_zip(Config) when is_list(Config) ->
     ?m(?BARG,zlib:zip(not_a_binary)),
     Bin = <<1,11,1,23,45>>,
@@ -520,24 +499,7 @@ api_un_zip(Config) when is_list(Config) ->
     Z = zlib:zip(B),
     ?m(B, zlib:unzip(Z)).
 
-%% api_g_un_zip_file(doc) -> "Test gunzip_file";
-%% api_g_un_zip_file(suite) -> [];
-%% api_g_un_zip_file(Config) when is_list(Config) ->
-%%     ?line Out = conf(data_dir,Config), 
-%%     io:format("Using OutDir ~p ~n", [Out]),
-%%     F = filename:join(Out,"testing1"),
-%%     Data = <<1,1,255,255,255,1,1>>,
-%%     ?m(ok, file:write_file(F,Data)),
-%%     ?line Compressed = zlib:gzip_file(F),
-%%     ?m(ok, file:write_file(F++".gz",Compressed)),
-%%     ?m(Data, zlib:gunzip_file(F++".gz")),
-%%     ?m({error,enoent}, zlib:gunzip_file(gurka)),
-%%     ?m({error,enoent}, zlib:gzip_file(gurka)),
-%%     ?m({error,what}, zlib:gunzip_file(F)),
-%%     ?line ok.
-
-api_g_un_zip(doc) -> "Test gunzip";
-api_g_un_zip(suite) -> [];
+%% Test gunzip.
 api_g_un_zip(Config) when is_list(Config) ->
     ?m(?BARG,zlib:gzip(not_a_binary)),
     Bin = <<1,11,1,23,45>>,
@@ -565,8 +527,6 @@ bad_len_data() ->
     <<31,139,8,0,0,0,0,0,0,3,211,2,0,91,38,185,9,2,0,0,0>>.
 
 
-intro(suite) -> [];
-intro(doc) -> "";
 intro(Config) when is_list(Config) ->
     D = <<"This is a binary">>,
     [put({ex, N}, <<"This is a binary">>) || N <- [0,1,2,3,4]],
@@ -594,8 +554,7 @@ intro(Config) when is_list(Config) ->
     ?m(Orig, zlib:uncompress(Res)).
 
 
-large_deflate(doc) -> "Test deflate large file, which had a bug reported on erlang-bugs";
-large_deflate(suite) -> [];
+%% Test deflate large file, which had a bug reported on erlang-bugs.
 large_deflate(Config) when is_list(Config) ->
     large_deflate_do().
 large_deflate_do() ->
@@ -618,8 +577,7 @@ rand_bytes(Bin, Sz) ->
     rand_bytes(<<(erlang:md5(Bin))/binary, Bin/binary>>, Sz).
 
 
-zip_usage(doc) -> "Test a standard compressed zip file";
-zip_usage(suite) -> [];
+%% Test a standard compressed zip file.
 zip_usage(Config) when is_list(Config) ->
     zip_usage(zip_usage({get_arg,Config}));
 zip_usage({get_arg,Config}) ->
@@ -690,8 +648,7 @@ zip_usage({run,ZIP,ORIG}) ->
     ?line ok = zlib:close(Z),
     ?line ok.
 
-gz_usage(doc) -> "Test a standard compressed gzipped file";
-gz_usage(suite) -> [];
+%% Test a standard compressed gzipped file.
 gz_usage(Config) when is_list(Config) ->
     gz_usage(gz_usage({get_arg,Config}));
 gz_usage({get_arg,Config}) ->
@@ -711,8 +668,7 @@ gz_usage({run,GZIP,ORIG,GZIP2}) ->
     ?m(true,zlib:crc32(Z,UC5) == zlib:crc32(Z,ORIG)),
     ?line ok = zlib:close(Z).
 
-gz_usage2(doc) -> "Test more of a standard compressed gzipped file";
-gz_usage2(suite) -> [];
+%% Test more of a standard compressed gzipped file.
 gz_usage2(Config) ->
     case os:find_executable("gzip") of
 	Name when is_list(Name) ->
@@ -740,10 +696,8 @@ gz_usage2(Config) ->
     
 
 
-compress_usage(doc) -> 
-    "Test that (de)compress funcs work with" 
-	" standard tools, for example a chunk from a png file";
-compress_usage(suite) -> [];
+%% Test that (de)compress funcs work with standard tools, for example
+%% a chunk from a png file.
 compress_usage(Config) when is_list(Config) ->
     compress_usage(compress_usage({get_arg,Config}));
 compress_usage({get_arg,Config}) ->
@@ -798,8 +752,7 @@ compress_usage({run,C1}) ->
     ?line ok = zlib:close(ZU).
 
 
-crc(doc) -> "Check that crc works as expected";
-crc(suite) -> [];
+%% Check that crc works as expected.
 crc(Config) when is_list(Config) ->
     crc(crc({get_arg,Config}));
 crc({get_arg,Config}) ->
@@ -828,8 +781,7 @@ crc({run,C1}) ->
     ?m(Crc,Comb),
     ?line ok = zlib:close(Z).
 
-adler(doc) -> "Check that adler works as expected";
-adler(suite) -> [];
+%% Check that adler works as expected.
 adler(Config) when is_list(Config) ->
     adler(adler({get_arg,Config}));
 adler({get_arg,Config}) ->
@@ -859,8 +811,7 @@ adler({run,C1}) ->
     ?m(Crc,Comb),
     ?line ok = zlib:close(Z).
 
-dictionary_usage(doc) -> "Test dictionary usage";
-dictionary_usage(suite) -> [];
+%% Test dictionary usage.
 dictionary_usage(Config) when is_list(Config) ->
     dictionary_usage(dictionary_usage({get_arg,Config}));
 dictionary_usage({get_arg,_Config}) ->
@@ -896,8 +847,7 @@ split_bin(Last,Acc) ->
     lists:reverse([Last|Acc]).
 
 
-smp(doc) -> "Check concurrent access to zlib driver";
-smp(suite) -> [];
+%% Check concurrent access to zlib driver.
 smp(Config) ->
     case erlang:system_info(smp_support) of
 	true ->
@@ -950,8 +900,7 @@ wait_pids(Pids) ->
     end.
 
 
-otp_7359(doc) -> "Deflate/inflate data with size close to multiple of internal buffer size";
-otp_7359(suite) -> [];
+%% Deflate/inflate data with size close to multiple of internal buffer size.
 otp_7359(_Config) ->
     %% Find compressed size
     ZTry = zlib:open(),