diff --git a/library/network/test/load_ipv6_cfg_test.rb b/library/network/test/load_ipv6_cfg_test.rb
new file mode 100644
index 000000000..0f3ac2504
--- /dev/null
+++ b/library/network/test/load_ipv6_cfg_test.rb
@@ -0,0 +1,33 @@
+#! /usr/bin/env ruby
+
+require "minitest/spec"
+require "minitest/autorun"
+
+require "yast"
+
+Yast.import "NetworkInterfaces"
+
+# mocked IPv6 relevant part of loaded ifcfg
+IPV6_IFCFG = [
+  {
+    :data => { "IPADDR" => "2001:15c0:668e::5", "PREFIXLEN" => "48" },
+    :expected => { "IPADDR" => "2001:15c0:668e::5", "PREFIXLEN" => "48", "NETMASK" => "" }
+  },
+  {
+    :data => { "IPADDR" => "2001:15c0:668e::5/48", "PREFIXLEN" => "" },
+    :expected => { "IPADDR" => "2001:15c0:668e::5", "PREFIXLEN" => "48", "NETMASK" => "" }
+  },
+  {
+    :data => { "IPADDR" => "2a00:8a00:6000:40::451", "PREFIXLEN" => "119" },
+    :expected => { "IPADDR" => "2a00:8a00:6000:40::451", "PREFIXLEN" => "119", "NETMASK" => "" }
+  }
+]
+
+describe "When reading devices configuration with IPv6 setup" do
+  it "Sets ipaddr, prefix and empty mask" do
+    IPV6_IFCFG.each do |ipv6_ifcfg|
+      canonical_ifcfg = Yast::NetworkInterfaces.CanonicalizeIP( ipv6_ifcfg[ :data])
+      canonical_ifcfg.must_equal( ipv6_ifcfg[ :expected])
+    end
+  end
+end
diff --git a/library/network/testsuite/tests/NetworkInterfaces.out b/library/network/testsuite/tests/NetworkInterfaces.out
index 88b7a7d0d..a49755637 100644
--- a/library/network/testsuite/tests/NetworkInterfaces.out
+++ b/library/network/testsuite/tests/NetworkInterfaces.out
@@ -32,5 +32,3 @@ Return	$["IPADDR":"10.0.0.1", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "other":"d
 Return	nil
 Return	$[]
 Return	$["IPADDR":"10.0.0.1", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "other":"data"]
-Return	$["IPADDR":"2001:15c0:668e::5", "NETMASK":"", "PREFIXLEN":"48"]
-Return	$["IPADDR":"2001:15c0:668e::5", "NETMASK":"", "PREFIXLEN":"48"]
diff --git a/library/network/testsuite/tests/NetworkInterfaces.rb b/library/network/testsuite/tests/NetworkInterfaces.rb
index 563d06acc..aaf94f691 100644
--- a/library/network/testsuite/tests/NetworkInterfaces.rb
+++ b/library/network/testsuite/tests/NetworkInterfaces.rb
@@ -80,9 +80,6 @@ def main
         nil,
         {},
         { "IPADDR" => "10.0.0.1", "other" => "data" },
-        # IPv6
-        { "IPADDR" => "2001:15c0:668e::5", "PREFIXLEN" => "48" },
-        { "IPADDR" => "2001:15c0:668e::5/48", "PREFIXLEN" => "" }
       ]
       Builtins.foreach(@addresses) { |address| TEST(lambda do
         NetworkInterfaces.CanonicalizeIP(address)