diff --git a/testsuite/tests/dns.err b/testsuite/tests/dns.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/testsuite/tests/dns.out b/testsuite/tests/dns.out
new file mode 100644
index 000000000..2ac416a7c
--- /dev/null
+++ b/testsuite/tests/dns.out
@@ -0,0 +1,6 @@
+Read	.target.tmpdir nil
+Log	Failed to set temporary directory: nil
+Log	GetHostnameFromGetent: Invalid hostname detected (-invalid_hostname-)
+Log	GetHostnameFromGetent: input params - begin
+Log	3.3.3.3         -invalid_hostname-
+Log	GetHostnameFromGetent: input params - end
diff --git a/testsuite/tests/dns.ycp b/testsuite/tests/dns.ycp
new file mode 100644
index 000000000..c3d2cceb7
--- /dev/null
+++ b/testsuite/tests/dns.ycp
@@ -0,0 +1,42 @@
+{
+
+import "Assert";
+import "Testsuite";
+
+map READ = $[
+
+    "probe" : $[
+        "architecture" : "i386",
+    ],
+    "sysconfig" : $[
+        "console" : $[
+            "CONSOLE_ENCODING" : "UTF-8",
+        ],
+    ],
+];
+
+map EXEC = $[ 
+    "target": $[
+        "bash_output": $[
+                "exit": 0,
+                "stdout": "charset=UTF-8",
+                "stderr":"",
+        ],
+    ],
+];
+
+list<string> hostnames = [
+    "127.0.0.1       localhost",
+    "1.1.1.1         1-hostname alias",
+    "2.2.2.2         hostname-2",
+    "3.3.3.3         -invalid_hostname-",
+];
+
+import "DNS";
+
+Assert::Equal( "localhost", DNS::GetHostnameFromGetent( hostnames[ 0]:"") );
+Assert::Equal( "1-hostname", DNS::GetHostnameFromGetent( hostnames[ 1]:"") );
+Assert::Equal( "hostname-2", DNS::GetHostnameFromGetent( hostnames[ 2]:"") );
+Assert::Equal( "", DNS::GetHostnameFromGetent( hostnames[ 3]:"") );
+
+} /* EOF */