Update all test specs

50 files changed, 95 insertions, 111 deletions

diff --git a/erts/emulator/test/emulator.spec b/erts/emulator/test/emulator.spec
index 533252219f..1ea751cc3b 100644
--- a/erts/emulator/test/emulator.spec
+++ b/erts/emulator/test/emulator.spec
@@ -1 +1 @@
-{suites,"emulator_test",all}.
+{suites,"../emulator_test",all}.
diff --git a/erts/epmd/test/epmd.spec b/erts/epmd/test/epmd.spec
index d77bc4afb9..e72272cf94 100644
--- a/erts/epmd/test/epmd.spec
+++ b/erts/epmd/test/epmd.spec
@@ -1 +1 @@
-{suites,"epmd_test",all}.
+{suites,"../epmd_test",all}.
diff --git a/erts/test/system.spec b/erts/test/system.spec
index 7da3cfc64a..e0561ba0b2 100644
--- a/erts/test/system.spec
+++ b/erts/test/system.spec
@@ -1 +1 @@
-{suites,"system_test",all}.
+{suites,"../system_test",all}.
diff --git a/lib/asn1/test/asn1.spec b/lib/asn1/test/asn1.spec
index 2a29db10ff..ae96de3a58 100644
--- a/lib/asn1/test/asn1.spec
+++ b/lib/asn1/test/asn1.spec
@@ -1 +1 @@
-{suites,"asn1_test",all}.
+{suites,"../asn1_test",all}.
diff --git a/lib/common_test/test/common_test.spec b/lib/common_test/test/common_test.spec
index e1b4fa8d39..8755b08117 100644
--- a/lib/common_test/test/common_test.spec
+++ b/lib/common_test/test/common_test.spec
@@ -1 +1 @@
-{suites,"common_test_test",all}.
\ No newline at end of file
+{suites,"../common_test_test",all}.
\ No newline at end of file
diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index 2d08e71e09..934bf39393 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -153,7 +153,7 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) compiler.dynspec compiler.cover \
+	$(INSTALL_DATA) compiler.spec compiler.cover \
 		$(EMAKEFILE) $(ERL_FILES) $(CORE_FILES) $(RELSYSDIR)
 	$(INSTALL_DATA) $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES) \
 		$(INLINE_ERL_FILES) $(RELSYSDIR)
diff --git a/lib/compiler/test/compiler.dynspec b/lib/compiler/test/compiler.dynspec
deleted file mode 100644
index 7e452cef6c..0000000000
--- a/lib/compiler/test/compiler.dynspec
+++ /dev/null
@@ -1,10 +0,0 @@
-%% -*- erlang -*-
-%% You can test this file using this command.
-%%    file:script("compiler.dynspec", [{'Os',"Unix"}]).
-
-case Os of
-    "VxWorks" ->
-	[{skip,{compile_SUITE,listings,"VxWorks filesystem too slow"}}];
-    _ ->
-	[]
-end.
diff --git a/lib/compiler/test/compiler.spec b/lib/compiler/test/compiler.spec
new file mode 100644
index 0000000000..f2546c3ced
--- /dev/null
+++ b/lib/compiler/test/compiler.spec
@@ -0,0 +1,2 @@
+%% -*- erlang -*-
+{suites,"../compiler_test",all}.
diff --git a/lib/cosEvent/test/cosEvent.spec b/lib/cosEvent/test/cosEvent.spec
index 202cba887f..f793693779 100644
--- a/lib/cosEvent/test/cosEvent.spec
+++ b/lib/cosEvent/test/cosEvent.spec
@@ -1 +1 @@
-{suites,"cosEvent_test",all}.
+{suites,"../cosEvent_test",all}.
diff --git a/lib/cosEventDomain/test/cosEventDomain.spec b/lib/cosEventDomain/test/cosEventDomain.spec
index 0d31e32419..bcee74c5f1 100644
--- a/lib/cosEventDomain/test/cosEventDomain.spec
+++ b/lib/cosEventDomain/test/cosEventDomain.spec
@@ -1 +1 @@
-{suites,"cosEventDomain_test",all}.
+{suites,"../cosEventDomain_test",all}.
diff --git a/lib/cosFileTransfer/test/cosFileTransfer.spec b/lib/cosFileTransfer/test/cosFileTransfer.spec
index 80fe919f2a..290b27d048 100644
--- a/lib/cosFileTransfer/test/cosFileTransfer.spec
+++ b/lib/cosFileTransfer/test/cosFileTransfer.spec
@@ -1 +1 @@
-{topcase, {dir, "../cosFileTransfer_test"}}.
+{suites,"../cosFileTransfer_test", all}.
diff --git a/lib/cosNotification/test/cosNotification.spec b/lib/cosNotification/test/cosNotification.spec
index 01c245cec2..8ec1baca33 100644
--- a/lib/cosNotification/test/cosNotification.spec
+++ b/lib/cosNotification/test/cosNotification.spec
@@ -1 +1 @@
-{suites,"cosNotification_test",all}.
+{suites,"../cosNotification_test",all}.
diff --git a/lib/cosProperty/test/cosProperty.spec b/lib/cosProperty/test/cosProperty.spec
index 662150fb86..d3d44321c8 100644
--- a/lib/cosProperty/test/cosProperty.spec
+++ b/lib/cosProperty/test/cosProperty.spec
@@ -1 +1 @@
-{suites,"cosProperty_test",all}.
+{suites,"../cosProperty_test",all}.
diff --git a/lib/cosTime/test/cosTime.spec b/lib/cosTime/test/cosTime.spec
index 66af3e7941..8bf6f740fe 100644
--- a/lib/cosTime/test/cosTime.spec
+++ b/lib/cosTime/test/cosTime.spec
@@ -1 +1 @@
-{suites,"cosTime_test",all}.
+{suites,"../cosTime_test",all}.
diff --git a/lib/cosTransactions/test/cosTransactions.spec b/lib/cosTransactions/test/cosTransactions.spec
index da226271c3..9918c8ca16 100644
--- a/lib/cosTransactions/test/cosTransactions.spec
+++ b/lib/cosTransactions/test/cosTransactions.spec
@@ -1 +1 @@
-{suites,"cosTransactions_test",all}.
+{suites,"../cosTransactions_test",all}.
diff --git a/lib/crypto/test/crypto.spec b/lib/crypto/test/crypto.spec
index 52fb4c1c98..cc09970cb3 100644
--- a/lib/crypto/test/crypto.spec
+++ b/lib/crypto/test/crypto.spec
@@ -1 +1 @@
-{suites,"crypto_test",all}.
+{suites,"../crypto_test",all}.
diff --git a/lib/debugger/test/debugger.spec b/lib/debugger/test/debugger.spec
index 426b2757ac..7aef026e77 100644
--- a/lib/debugger/test/debugger.spec
+++ b/lib/debugger/test/debugger.spec
@@ -1 +1 @@
-{suites,"debugger_test",all}.
+{suites,"../debugger_test",all}.
diff --git a/lib/edoc/test/edoc.spec b/lib/edoc/test/edoc.spec
index 02e3eca8fe..8371427270 100644
--- a/lib/edoc/test/edoc.spec
+++ b/lib/edoc/test/edoc.spec
@@ -1 +1 @@
-{suites,"edoc_test",all}.
+{suites,"../edoc_test",all}.
diff --git a/lib/erl_interface/test/erl_interface.spec b/lib/erl_interface/test/erl_interface.spec
index 59542b6558..a0a7acfa50 100644
--- a/lib/erl_interface/test/erl_interface.spec
+++ b/lib/erl_interface/test/erl_interface.spec
@@ -1 +1 @@
-{suites,"erl_interface_test",all}.
+{suites,"../erl_interface_test",all}.
diff --git a/lib/et/test/et.spec b/lib/et/test/et.spec
index f363993ab7..09993a217a 100644
--- a/lib/et/test/et.spec
+++ b/lib/et/test/et.spec
@@ -1 +1 @@
-{suites,"et_test",all}.
+{suites,"../et_test",all}.
diff --git a/lib/eunit/test/Makefile b/lib/eunit/test/Makefile
index 74d485d1cc..a2d276f619 100644
--- a/lib/eunit/test/Makefile
+++ b/lib/eunit/test/Makefile
@@ -75,7 +75,7 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) eunit.dynspec $(EMAKEFILE) \
+	$(INSTALL_DATA) eunit.spec $(EMAKEFILE) \
 		$(COVERFILE) $(ERL_FILES) \
 		$(RELSYSDIR)
 
diff --git a/lib/eunit/test/eunit.dynspec b/lib/eunit/test/eunit.dynspec
deleted file mode 100644
index c1d345ac14..0000000000
--- a/lib/eunit/test/eunit.dynspec
+++ /dev/null
@@ -1,6 +0,0 @@
-%% -*- erlang -*-
-%% You can test this file using this command.
-%%    file:script("eunit.dynspec", [{'Os',"Unix"}]).
-
-[].
-
diff --git a/lib/eunit/test/eunit.spec b/lib/eunit/test/eunit.spec
new file mode 100644
index 0000000000..2db7731a7e
--- /dev/null
+++ b/lib/eunit/test/eunit.spec
@@ -0,0 +1,3 @@
+%% -*- erlang -*-
+{suites,"../eunit_test",all}.
+
diff --git a/lib/ic/test/ic.spec b/lib/ic/test/ic.spec
index 4fafc1b681..22905dcee4 100644
--- a/lib/ic/test/ic.spec
+++ b/lib/ic/test/ic.spec
@@ -1 +1 @@
-{suites,"ic_test",all}.
+{suites,"../ic_test",all}.
diff --git a/lib/inets/test/inets.spec b/lib/inets/test/inets.spec
index 44c7c98916..ed102f8219 100644
--- a/lib/inets/test/inets.spec
+++ b/lib/inets/test/inets.spec
@@ -1 +1 @@
-{suites,"inets_test",all}.
+{suites,"../inets_test",all}.
diff --git a/lib/inviso/test/inviso.spec b/lib/inviso/test/inviso.spec
index 49b3f67096..49f9b0b460 100644
--- a/lib/inviso/test/inviso.spec
+++ b/lib/inviso/test/inviso.spec
@@ -1 +1 @@
-{suites,"inviso_test",all}.
+{suites,"../inviso_test",all}.
diff --git a/lib/jinterface/test/Makefile b/lib/jinterface/test/Makefile
index 36955d1e91..b2ddffea42 100644
--- a/lib/jinterface/test/Makefile
+++ b/lib/jinterface/test/Makefile
@@ -32,7 +32,7 @@ RELSYSDIR = $(RELEASE_PATH)/jinterface_test
 # ----------------------------------------------------
 # Target Specs
 # ----------------------------------------------------
-TEST_SPEC_FILE = jinterface.dynspec
+TEST_SPEC_FILE = jinterface.spec
 
 MODULES = nc_SUITE \
 	  jinterface_SUITE
diff --git a/lib/jinterface/test/jinterface.dynspec b/lib/jinterface/test/jinterface.spec
index 44712521df..99bc0f4005 100644
--- a/lib/jinterface/test/jinterface.dynspec
+++ b/lib/jinterface/test/jinterface.spec
@@ -17,16 +17,4 @@
 %%
 %% %CopyrightEnd%
 %%
-%% You can test this file using this command.
-%%    file:script("jinterface.dynspec", [{'Os',"Unix"}]).
-
-case case code:priv_dir(jinterface) of
-        {error,bad_name} -> false;
-        P -> filelib:is_dir(P) end of
-    true ->
-        [];
-    false ->
-        NoApp = "No jinterface application",
-        [{skip,{nc_SUITE,NoApp}},
-         {skip,{jinterface_SUITE,NoApp}}]
-end.
+{suites,"../jinterface_test",all}.
diff --git a/lib/jinterface/test/jinterface_SUITE.erl b/lib/jinterface/test/jinterface_SUITE.erl
index db33059af5..b42101908e 100644
--- a/lib/jinterface/test/jinterface_SUITE.erl
+++ b/lib/jinterface/test/jinterface_SUITE.erl
@@ -163,7 +163,14 @@ status_handler() ->
 
 
 init_per_suite(Config) when is_list(Config) ->
-    jitu:init_all(Config).
+    case case code:priv_dir(jinterface) of
+	     {error,bad_name} -> false;
+	     P -> filelib:is_dir(P) end of
+	true ->
+	    jitu:init_all(Config);
+	false ->
+	    {skip,"No jinterface application"}
+    end.
 
 end_per_suite(Config) when is_list(Config) ->
     jitu:finish_all(Config).
diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl
index fde2fd5071..f9a588f32c 100644
--- a/lib/jinterface/test/nc_SUITE.erl
+++ b/lib/jinterface/test/nc_SUITE.erl
@@ -69,12 +69,15 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-
-
-
-
 init_per_suite(Config) when is_list(Config) ->
-    jitu:init_all(Config).
+    case case code:priv_dir(jinterface) of
+	     {error,bad_name} -> false;
+	     P -> filelib:is_dir(P) end of
+	true ->
+	    jitu:init_all(Config);
+	false ->
+	    {skip,"No jinterface application"}
+    end.
 
 end_per_suite(Config) ->
     jitu:finish_all(Config).
diff --git a/lib/kernel/test/kernel.spec b/lib/kernel/test/kernel.spec
index 9bb95f9ada..62afc9f97b 100644
--- a/lib/kernel/test/kernel.spec
+++ b/lib/kernel/test/kernel.spec
@@ -1,4 +1,4 @@
 {config, "../test_server/ts.config"}.
 {config, "../test_server/ts.unix.config"}.
 
-{suites, "kernel_test", all}.
+{suites,"../kernel_test", all}.
diff --git a/lib/megaco/test/megaco.spec b/lib/megaco/test/megaco.spec
index 6f8ee92c3c..cab8499835 100644
--- a/lib/megaco/test/megaco.spec
+++ b/lib/megaco/test/megaco.spec
@@ -1,2 +1,2 @@
-{suites,"megaco_test",all}.
-{skip_cases,"megaco_test",megaco_measure_test,[all],"Not yet implemented"}.
+{suites,"../megaco_test",all}.
+{skip_cases,"../megaco_test",megaco_measure_test,[all],"Not yet implemented"}.
diff --git a/lib/mnesia/test/mnesia.spec b/lib/mnesia/test/mnesia.spec
index d24873eed0..204d1519cb 100644
--- a/lib/mnesia/test/mnesia.spec
+++ b/lib/mnesia/test/mnesia.spec
@@ -1,21 +1,21 @@
-{suites,"mnesia_test",all}.
-{skip_cases,"mnesia_test",mnesia_measure_test,
+{suites,"../mnesia_test",all}.
+{skip_cases,"../mnesia_test",mnesia_measure_test,
             [ram_meter],
             "Takes to long time"}.
-{skip_cases,"mnesia_test",mnesia_measure_test,
+{skip_cases,"../mnesia_test",mnesia_measure_test,
             [disc_meter],
             "Takes to long time"}.
-{skip_cases,"mnesia_test",mnesia_measure_test,
+{skip_cases,"../mnesia_test",mnesia_measure_test,
             [disc_only_meter],
             "Takes to long time"}.
-{skip_cases,"mnesia_test",mnesia_measure_test,[cost],"Takes to long time"}.
-{skip_cases,"mnesia_test",mnesia_measure_test,
+{skip_cases,"../mnesia_test",mnesia_measure_test,[cost],"Takes to long time"}.
+{skip_cases,"../mnesia_test",mnesia_measure_test,
             [dbn_meters],
             "Takes to long time"}.
-{skip_cases,"mnesia_test",mnesia_measure_test,
+{skip_cases,"../mnesia_test",mnesia_measure_test,
             [ram_tpcb,disc_tpcb,disc_only_tpcb],
             "Takes to long time"}.
-{skip_cases,"mnesia_test",mnesia_measure_test,
+{skip_cases,"../mnesia_test",mnesia_measure_test,
             [reader_disturbed_by_node_down,writer_disturbed_by_node_down,
              reader_disturbed_by_node_up,writer_disturbed_by_node_up,
              reader_disturbed_by_schema_ops,writer_disturbed_by_schema_ops,
@@ -26,51 +26,51 @@
              reader_competing_with_reader,reader_competing_with_writer,
              writer_competing_with_reader,writer_competing_with_writer],
             "Not yet implemented"}.
-{skip_cases,"mnesia_test",mnesia_measure_test,
+{skip_cases,"../mnesia_test",mnesia_measure_test,
             [measure_resource_consumption,determine_resource_leakage],
             "Not yet implemented"}.
-{skip_cases,"mnesia_test",mnesia_measure_test,
+{skip_cases,"../mnesia_test",mnesia_measure_test,
             [determine_system_limits,performance_at_min_config,
              performance_at_max_config,performance_at_full_load,
              resource_consumption_at_min_config,
              resource_consumption_at_max_config,
              resource_consumption_at_full_load],
             "Not yet implemented"}.
-{skip_cases,"mnesia_test",mnesia_measure_test,
+{skip_cases,"../mnesia_test",mnesia_measure_test,
             [ram_tpcb,disc_tpcb,disc_only_tpcb],
             "Takes too much time and memory"}.
-{skip_cases,"mnesia_test",mnesia_measure_test,
+{skip_cases,"../mnesia_test",mnesia_measure_test,
             [measure_all_api_functions],
             "Not yet implemented"}.
-{skip_cases,"mnesia_test",mnesia_measure_test,
+{skip_cases,"../mnesia_test",mnesia_measure_test,
             [mnemosyne_vs_mnesia_kernel],
             "Not yet implemented"}.
-{skip_cases,"mnesia_test",mnesia_examples_test,
+{skip_cases,"../mnesia_test",mnesia_examples_test,
             [company],
             "Not yet implemented"}.
-{skip_cases,"mnesia_test",mnesia_config_test,
+{skip_cases,"../mnesia_test",mnesia_config_test,
             [ignore_fallback_at_startup],
             "Not yet implemented"}.
-{skip_cases,"mnesia_test",mnesia_evil_backup,
+{skip_cases,"../mnesia_test",mnesia_evil_backup,
             [local_backup_checkpoint],
             "Not yet implemented"}.
-{skip_cases,"mnesia_test",mnesia_config_test,
+{skip_cases,"../mnesia_test",mnesia_config_test,
             [max_wait_for_decision],
             "Not yet implemented"}.
-{skip_cases,"mnesia_test",mnesia_recovery_test,
+{skip_cases,"../mnesia_test",mnesia_recovery_test,
             [after_full_disc_partition],
             "Not yet implemented"}.
-{skip_cases,"mnesia_test",mnesia_recovery_test,
+{skip_cases,"../mnesia_test",mnesia_recovery_test,
             [system_upgrade],
             "Not yet implemented"}.
-{skip_cases,"mnesia_test",mnesia_consistency_test,
+{skip_cases,"../mnesia_test",mnesia_consistency_test,
             [consistency_after_change_table_copy_type],
             "Not yet implemented"}.
-{skip_cases,"mnesia_test",mnesia_consistency_test,
+{skip_cases,"../mnesia_test",mnesia_consistency_test,
             [consistency_after_transform_table_ram,
              consistency_after_transform_table_disc,
              consistency_after_transform_table_disc_only],
             "Not yet implemented"}.
-{skip_cases,"mnesia_test",mnesia_consistency_test,
+{skip_cases,"../mnesia_test",mnesia_consistency_test,
             [consistency_after_rename_of_node],
             "Not yet implemented"}.
diff --git a/lib/observer/test/observer.spec b/lib/observer/test/observer.spec
index 065be46fef..3b4b5da28c 100644
--- a/lib/observer/test/observer.spec
+++ b/lib/observer/test/observer.spec
@@ -1 +1 @@
-{suites,"observer_test",all}.
+{suites,"../observer_test",all}.
diff --git a/lib/odbc/test/odbc.spec b/lib/odbc/test/odbc.spec
index 2151406901..edaf821c91 100644
--- a/lib/odbc/test/odbc.spec
+++ b/lib/odbc/test/odbc.spec
@@ -1,25 +1,25 @@
-{suites,"odbc_test",all}.
-{skip_cases,"odbc_test",odbc_data_type_SUITE,
+{suites,"../odbc_test",all}.
+{skip_cases,"../odbc_test",odbc_data_type_SUITE,
             [varchar_upper_limit],
             "Known bug in database"}.
-{skip_cases,"odbc_test",odbc_data_type_SUITE,
+{skip_cases,"../odbc_test",odbc_data_type_SUITE,
             [text_upper_limit],
             "Consumes too much resources"}.
-{skip_cases,"odbc_test",odbc_data_type_SUITE,
+{skip_cases,"../odbc_test",odbc_data_type_SUITE,
             [bit_true],
             "Not supported by driver"}.
-{skip_cases,"odbc_test",odbc_data_type_SUITE,
+{skip_cases,"../odbc_test",odbc_data_type_SUITE,
             [bit_false],
             "Not supported by driver"}.
-{skip_cases,"odbc_test",odbc_query_SUITE,
+{skip_cases,"../odbc_test",odbc_query_SUITE,
             [multiple_select_result_sets],
             "Not supported by driver"}.
-{skip_cases,"odbc_test",odbc_query_SUITE,
+{skip_cases,"../odbc_test",odbc_query_SUITE,
             [multiple_mix_result_sets],
             "Not supported by driver"}.
-{skip_cases,"odbc_test",odbc_query_SUITE,
+{skip_cases,"../odbc_test",odbc_query_SUITE,
             [multiple_result_sets_error],
             "Not supported by driver"}.
-{skip_cases,"odbc_test",odbc_query_SUITE,
+{skip_cases,"../odbc_test",odbc_query_SUITE,
             [param_insert_tiny_int],
             "Not supported by driver"}.
diff --git a/lib/orber/test/orber.spec b/lib/orber/test/orber.spec
index a5f48a3611..0dd30deade 100644
--- a/lib/orber/test/orber.spec
+++ b/lib/orber/test/orber.spec
@@ -1 +1 @@
-{suites,"orber_test",all}.
+{suites,"../orber_test",all}.
diff --git a/lib/os_mon/test/os_mon.spec b/lib/os_mon/test/os_mon.spec
index 859859c587..d292b258f3 100644
--- a/lib/os_mon/test/os_mon.spec
+++ b/lib/os_mon/test/os_mon.spec
@@ -1 +1 @@
-{suites,"os_mon_test",all}.
+{suites,"../os_mon_test",all}.
diff --git a/lib/parsetools/test/parsetools.spec b/lib/parsetools/test/parsetools.spec
index 97dfe58f97..870d57baf1 100644
--- a/lib/parsetools/test/parsetools.spec
+++ b/lib/parsetools/test/parsetools.spec
@@ -1 +1 @@
-{suites,"parsetools_test",all}.
+{suites,"../parsetools_test",all}.
diff --git a/lib/percept/test/percept.spec b/lib/percept/test/percept.spec
index 10b3037283..f3ef76bd60 100644
--- a/lib/percept/test/percept.spec
+++ b/lib/percept/test/percept.spec
@@ -1 +1 @@
-{suites,"percept_test",all}.
+{suites,"../percept_test",all}.
diff --git a/lib/public_key/test/public_key.spec b/lib/public_key/test/public_key.spec
index d4a63b5dd4..1749822c2d 100644
--- a/lib/public_key/test/public_key.spec
+++ b/lib/public_key/test/public_key.spec
@@ -1 +1 @@
-{suites,"public_key_test",all}.
+{suites,"../public_key_test",all}.
diff --git a/lib/reltool/test/reltool.spec b/lib/reltool/test/reltool.spec
index d613ebd97d..2995720105 100644
--- a/lib/reltool/test/reltool.spec
+++ b/lib/reltool/test/reltool.spec
@@ -1 +1 @@
-{suites,"reltool_test",all}.
+{suites,"../reltool_test",all}.
diff --git a/lib/runtime_tools/test/runtime_tools.spec b/lib/runtime_tools/test/runtime_tools.spec
index 008c84de5e..0a24232be8 100644
--- a/lib/runtime_tools/test/runtime_tools.spec
+++ b/lib/runtime_tools/test/runtime_tools.spec
@@ -1 +1 @@
-{suites,"runtime_tools_test",all}.
+{suites,"../runtime_tools_test",all}.
diff --git a/lib/snmp/test/snmp.spec b/lib/snmp/test/snmp.spec
index 07492337fb..88ae0145f0 100644
--- a/lib/snmp/test/snmp.spec
+++ b/lib/snmp/test/snmp.spec
@@ -1 +1 @@
-{suites,"snmp_test",all}.
+{suites,"../snmp_test",all}.
diff --git a/lib/ssl/test/ssl.spec b/lib/ssl/test/ssl.spec
index 65adb51d36..fc7c1bbb82 100644
--- a/lib/ssl/test/ssl.spec
+++ b/lib/ssl/test/ssl.spec
@@ -1 +1 @@
-{suites,"ssl_test",all}.
+{suites,"../ssl_test",all}.
diff --git a/lib/stdlib/test/stdlib.spec b/lib/stdlib/test/stdlib.spec
index e67ac71c2f..3768e494b2 100644
--- a/lib/stdlib/test/stdlib.spec
+++ b/lib/stdlib/test/stdlib.spec
@@ -1 +1 @@
-{suites,"stdlib_test",all}.
+{suites,"../stdlib_test",all}.
diff --git a/lib/syntax_tools/test/Makefile b/lib/syntax_tools/test/Makefile
index 621c76f5a5..f08bf319f1 100644
--- a/lib/syntax_tools/test/Makefile
+++ b/lib/syntax_tools/test/Makefile
@@ -59,7 +59,7 @@ release_spec: opt
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) syntax_tools.dynspec $(RELSYSDIR)
+	$(INSTALL_DATA) syntax_tools.spec $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 
 release_docs_spec:
diff --git a/lib/syntax_tools/test/syntax_tools.dynspec b/lib/syntax_tools/test/syntax_tools.dynspec
deleted file mode 100644
index 981cb8175e..0000000000
--- a/lib/syntax_tools/test/syntax_tools.dynspec
+++ /dev/null
@@ -1,5 +0,0 @@
-%% -*- erlang -*-
-%% You can test this file using this command.
-%%    file:script("syntax_tools.dynspec", [{'Os',"Unix"}]).
-
-[].
diff --git a/lib/syntax_tools/test/syntax_tools.spec b/lib/syntax_tools/test/syntax_tools.spec
new file mode 100644
index 0000000000..e7ddbf7586
--- /dev/null
+++ b/lib/syntax_tools/test/syntax_tools.spec
@@ -0,0 +1,2 @@
+%% -*- erlang -*-
+{suites,"../syntax_tools_test",all}.
diff --git a/lib/tools/test/tools.spec b/lib/tools/test/tools.spec
index 05a5b8fca6..1b07cf1cb6 100644
--- a/lib/tools/test/tools.spec
+++ b/lib/tools/test/tools.spec
@@ -1 +1 @@
-{suites,"tools_test",all}.
+{suites,"../tools_test",all}.
diff --git a/lib/wx/test/wx.spec b/lib/wx/test/wx.spec
index 7181a01ab7..21e4a8c064 100644
--- a/lib/wx/test/wx.spec
+++ b/lib/wx/test/wx.spec
@@ -1 +1 @@
-{suites,"wx_test",all}.
+{suites,"../wx_test",all}.