4 files changed, 20 insertions, 31 deletions
diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index 4d37a8f543..093b675fd5 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -40,20 +40,18 @@
 %% Description: Returns documentation/test cases in this test suite
 %%		or a skip tuple if the platform is not supported.  
 %%--------------------------------------------------------------------
-all(doc) ->
-    ["Tests the ability to connect and disconnet to/from the database"];
+
 all(suite) ->
     case odbc_test_lib:odbc_check() of
-	ok -> all();
-	Other -> {skip, Other}
-    end.						  
-
-all() -> 
-    [not_exist_db, commit, rollback, not_explicit_commit,
-    no_c_node, port_dies, control_process_dies, client_dies,
-    connect_timeout, timeout, many_timeouts, timeout_reset,
-    disconnect_on_timeout, connection_closed,
-    disable_scrollable_cursors, return_rows_as_lists, api_missuse].
+	ok ->
+	    [not_exist_db, commit, rollback, not_explicit_commit,
+	     no_c_node, port_dies, control_process_dies, client_dies,
+	     connect_timeout, timeout, many_timeouts, timeout_reset,
+	     disconnect_on_timeout, connection_closed,
+	     disable_scrollable_cursors, return_rows_as_lists, api_missuse];
+	Other ->
+	    {skip, Other}
+    end.
 
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
diff --git a/lib/odbc/test/odbc_data_type_SUITE.erl b/lib/odbc/test/odbc_data_type_SUITE.erl
index 7d4a0ca15f..f0e35edbb2 100644
--- a/lib/odbc/test/odbc_data_type_SUITE.erl
+++ b/lib/odbc/test/odbc_data_type_SUITE.erl
@@ -43,13 +43,10 @@ all(doc) ->
     ["Tests data types"];
 all(suite) ->
     case odbc_test_lib:odbc_check() of
-	ok -> all();
+	ok -> [char, int, floats, dec_and_num, timestamp];
 	Other -> {skip,Other}
     end.						  
 
-all() ->
-    [char, int, floats, dec_and_num, timestamp].
-
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
 %% Config - [tuple()]
diff --git a/lib/odbc/test/odbc_query_SUITE.erl b/lib/odbc/test/odbc_query_SUITE.erl
index 12b39be3b7..25f4c837fa 100644
--- a/lib/odbc/test/odbc_query_SUITE.erl
+++ b/lib/odbc/test/odbc_query_SUITE.erl
@@ -42,19 +42,17 @@ all(doc) ->
     ["Tests SQL queries"];
 all(suite) ->
     case odbc_test_lib:odbc_check() of
-	ok -> all();
+	ok ->
+	    [sql_query, first, last, next, prev, select_count,select_next,
+	     select_relative, select_absolute, create_table_twice,
+	     delete_table_twice, duplicate_key, not_connection_owner,
+	     no_result_set, query_error, multiple_select_result_sets,
+	     multiple_mix_result_sets, multiple_result_sets_error,
+	     parameterized_queries, describe_table,
+	     delete_nonexisting_row];
 	Other -> {skip, Other}
     end.						  
 
-all() ->
-    [sql_query, first, last, next, prev, select_count,select_next,
-     select_relative, select_absolute, create_table_twice,
-     delete_table_twice, duplicate_key, not_connection_owner,
-     no_result_set, query_error, multiple_select_result_sets,
-     multiple_mix_result_sets, multiple_result_sets_error,
-     parameterized_queries, describe_table,
-     delete_nonexisting_row].
-
 
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
diff --git a/lib/odbc/test/odbc_start_SUITE.erl b/lib/odbc/test/odbc_start_SUITE.erl
index 2cca8e4546..07cda38c04 100644
--- a/lib/odbc/test/odbc_start_SUITE.erl
+++ b/lib/odbc/test/odbc_start_SUITE.erl
@@ -103,14 +103,10 @@ all(doc) ->
 
 all(suite) -> 
     case odbc_test_lib:odbc_check() of
-	ok -> all();
+	ok -> [start];
 	Other -> {skip, Other}
     end.						  
 
-all() ->
-    [start].
-
-
 %% Test cases starts here.
 %%--------------------------------------------------------------------