3 files changed, 16 insertions, 2 deletions
diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl
index 0b1abae757..1e1df908db 100644
--- a/lib/common_test/test/ct_config_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE.erl
@@ -251,6 +251,7 @@ expected_events(config_static_SUITE)->
      ?sok(test_alias_tclocal_nested,{14,0,{2,1}}),
      ?sok(test_alias_tclocal_nested_backward_compat,{15,0,{2,1}}),
      ?sok(test_alias_tclocal_nested_backward_compat_subvals,{16,0,{2,1}}),
+     ?sok(test_config_same_name_already_in_use,{17,0,{2,1}}),
      {?eh,tc_start,{config_static_SUITE,end_per_suite}},
      {?eh,tc_done,{config_static_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl
index 2e1ad651e8..19f1dab4af 100644
--- a/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl
@@ -64,7 +64,8 @@ all() -> [test_get_config_simple, test_get_config_nested,
 	  test_shadow_all,test_element,test_shadow_all_element,
 	  test_internal_deep, test_alias_tclocal_nested,
 	  test_alias_tclocal_nested_backward_compat,
-	  test_alias_tclocal_nested_backward_compat_subvals
+	  test_alias_tclocal_nested_backward_compat_subvals,
+	  test_config_same_name_already_in_use
 ].
 
 init_per_testcase(_,Config) ->
@@ -124,6 +125,13 @@ test_config_name_already_in_use2(_) ->
     ct:fail("Test should've been skipped, you shouldn't see this!"),
     ok.
 
+
+test_config_same_name_already_in_use() ->
+    [].
+test_config_same_name_already_in_use(_) ->
+    ok = ct:require(x2,{gen_cfg,c}),
+    ok = ct:require(x2,{gen_cfg,c}).
+
 %% test aliases
 test_alias_tclocal() ->
     [{require,newalias,gen_cfg}].
diff --git a/lib/common_test/test/ct_netconfc_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE.erl
index e6e8d5b09c..30084a6228 100644
--- a/lib/common_test/test/ct_netconfc_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE.erl
@@ -44,7 +44,12 @@
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
     Config1 = ct_test_support:init_per_suite(Config),
-    Config1.
+    case application:load(crypto) of
+	{error,Reason} ->
+	    {skip, Reason};
+	_ ->
+	    Config1
+    end.
 
 end_per_suite(Config) ->
     ct_test_support:end_per_suite(Config).