diff --git a/src/ua-parser.js b/src/ua-parser.js
index 302a20a..9424501 100755
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -471,9 +471,9 @@
             /android.+(transfo[prime\s]{4,10}\s\w+|eeepc|slider\s\w+|nexus 7|padfone|p00c)/i
             ], [MODEL, [VENDOR, 'Asus'], [TYPE, TABLET]], [
 
-            /(sony)\s(tablet\s[ps])\sbuild\//i,                                  // Sony
-            /(sony)?(?:sgp.+)\sbuild\//i
-            ], [[VENDOR, 'Sony'], [MODEL, 'Xperia Tablet'], [TYPE, TABLET]], [
+            /sony\stablet\s[ps]\sbuild\//i,                                    // Sony
+            /(?:sony)?sgp\w+(?:\sbuild\/|\))/i
+            ], [[MODEL, 'Xperia Tablet'], [VENDOR, 'Sony'], [TYPE, TABLET]], [
             /android.+\s([c-g]\d{4}|so[-l]\w+)(?=\sbuild\/|\).+chrome\/(?![1-6]{0,1}\d\.))/i
             ], [MODEL, [VENDOR, 'Sony'], [TYPE, MOBILE]], [
 
diff --git a/test/device-test.json b/test/device-test.json
index 436fac2..a0e33c6 100644
--- a/test/device-test.json
+++ b/test/device-test.json
@@ -549,6 +549,15 @@
             "type": "tablet"
         }
     },
+    {
+        "desc": "Sony Xperia Z2 Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1.1; SGP561) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.99 Safari/537.36",
+        "expect": {
+            "vendor": "Sony",
+            "model": "Xperia Tablet",
+            "type": "tablet"
+        }
+    },
     {
         "desc": "Sony Tablet S",
         "ua": "Mozilla/5.0 (Linux; U; Android 3.1; Sony Tablet S Build/THMAS10000) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13",