diff --git a/src/src/browser.cpp b/src/src/browser.cpp
index 2f12012..f6c61b6 100644
--- a/src/src/browser.cpp
+++ b/src/src/browser.cpp
@@ -63,7 +63,7 @@ BrowserPrivate::BrowserPrivate(Browser *browser, AbstractServer *server, const Q
 bool BrowserPrivate::updateService(const QByteArray &fqName)
 {
     // Split the FQDN into service name and type
-    int index = fqName.indexOf('.');
+    int index = fqName.indexOf('_') - 1;
     QByteArray serviceName = fqName.left(index);
     QByteArray serviceType = fqName.mid(index + 1);
 
diff --git a/tests/TestBrowser.cpp b/tests/TestBrowser.cpp
index 6aa54b7..b86280e 100644
--- a/tests/TestBrowser.cpp
+++ b/tests/TestBrowser.cpp
@@ -38,7 +38,7 @@
 
 Q_DECLARE_METATYPE(QMdnsEngine::Service)
 
-const QByteArray Name = "Test";
+const QByteArray Name = "Test.DotTest";
 const QByteArray Type = "_test._tcp.local.";
 const QByteArray Fqdn = Name + "." + Type;
 const QByteArray Target = "Test.local.";