1 files changed, 22 insertions, 18 deletions
diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index 592b3efee2..2e6020ae7a 100644
--- a/lib/snmp/test/snmp_compiler_test.erl
+++ b/lib/snmp/test/snmp_compiler_test.erl
@@ -28,7 +28,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 -include_lib("snmp/include/snmp_types.hrl").
 
@@ -37,8 +37,9 @@
 %% External exports
 %%----------------------------------------------------------------------
 -export([
-	 all/1, 
-         init_per_testcase/2, fin_per_testcase/2,
+	 all/0, 
+	 groups/0, init_per_group/2, end_per_group/2, 
+         init_per_testcase/2, end_per_testcase/2,
 
 	 description/1,
 	 oid_conflicts/1,
@@ -47,7 +48,6 @@
 	 agent_capabilities/1,
 	 module_compliance/1, 
 
-	 tickets/1,
 	 otp_6150/1,
 	 otp_8574/1, 
 	 otp_8595/1
@@ -82,8 +82,8 @@ init_per_testcase(_Case, Config) when is_list(Config) ->
     ?line ok = file:make_dir(CompDir),
     [{comp_dir, CompDir}, {mib_dir, MibDir} | Config].
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
-    CompDir  = ?config(comp_dir, Config),
+end_per_testcase(_Case, Config) when is_list(Config) ->
+    CompDir = ?config(comp_dir, Config),
     ?line ok = ?DEL_DIR(CompDir),
     lists:keydelete(comp_dir, 1, Config).
 
@@ -92,23 +92,27 @@ fin_per_testcase(_Case, Config) when is_list(Config) ->
 %% Test case definitions
 %%======================================================================
 
-all(suite) ->
+all() -> 
     [
-     description,
-     oid_conflicts,
-     imports,
+     description, 
+     oid_conflicts, 
+     imports, 
      module_identity,
      agent_capabilities,
      module_compliance,
-     tickets
+     {group, tickets}
     ].
 
-tickets(suite) ->
-    [
-     otp_6150,
-     otp_8574,
-     otp_8595
-    ].
+groups() -> 
+    [{tickets, [], [otp_6150, otp_8574, otp_8595]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 
 
 %%======================================================================
@@ -343,7 +347,7 @@ LAST-UPDATED \"0005290000Z\"
                         Ericsson Utvecklings AB
 Open System
 Box 1505
-SE-125 25 �LVSJ�\"
+SE-125 25 ÄLVSJÖ\"
 
 DESCRIPTION 
 \" Objects for management \"