1 files changed, 20 insertions, 23 deletions
diff --git a/lib/inets/test/inets_SUITE.erl b/lib/inets/test/inets_SUITE.erl
index 56983caace..6fa0f44d77 100644
--- a/lib/inets/test/inets_SUITE.erl
+++ b/lib/inets/test/inets_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -19,7 +19,7 @@
 %%
 -module(inets_SUITE).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 -include("inets_test_lib.hrl").
 
@@ -28,25 +28,26 @@
 
 -define(NUM_DEFAULT_SERVICES, 1).
 
-all(doc) ->
-    ["Test suites for the inets application."];
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, app_test}, {group, appup_test},
+     {group, services_test}, httpd_reload].
+
+groups() -> 
+    [{services_test, [],
+      [start_inets, start_httpc, start_httpd, start_ftpc,
+       start_tftpd]},
+     {app_test, [], [{inets_app_test, all}]},
+     {appup_test, [], [{inets_appup_test, all}]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [
-     app_test,
-     appup_test,
-     services_test,
-     httpd_reload
-    ].
 
-services_test(suite) ->
-    [
-     start_inets,
-     start_httpc,
-     start_httpd,
-     start_ftpc,
-     start_tftpd
-    ].
 
 
 %%--------------------------------------------------------------------
@@ -100,11 +101,7 @@ end_per_testcase(_, Config) ->
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-app_test(suite) ->
-    [{inets_app_test, all}].
 
-appup_test(suite) ->
-    [{inets_appup_test, all}].
 
 
 %%-------------------------------------------------------------------------