diff --git a/src/analytics.test.ts b/src/analytics.test.ts
index fe738745..eb3e23af 100644
--- a/src/analytics.test.ts
+++ b/src/analytics.test.ts
@@ -20,11 +20,8 @@ function setProcessPlatform(platform: NodeJS.Platform) {
 describe('viewScreenEvent', () => {
     const originalPlatform = process.platform;
 
-    beforeAll(() => {
-        setProcessPlatform('win32');
-    });
-
     beforeEach(() => {
+        setProcessPlatform('win32');
         mockedData.getFirstAAID_value = true;
     });
 
diff --git a/src/analytics.ts b/src/analytics.ts
index 12af6efa..95b5b907 100644
--- a/src/analytics.ts
+++ b/src/analytics.ts
@@ -21,7 +21,7 @@ export const Registry = {
 };
 
 class AnalyticsPlatform {
-    private static nodeJsPlatformMapping: Record<string, any> = {
+    private static nodeJsPlatformMapping: Record<NodeJS.Platform, string> = {
         aix: 'desktop',
         android: 'android',
         darwin: 'mac',
@@ -31,9 +31,11 @@ class AnalyticsPlatform {
         sunos: 'desktop',
         win32: 'windows',
         cygwin: 'windows',
+        haiku: 'unknown',
+        netbsd: 'unknown',
     };
 
-    static for(p: string): string {
+    static for(p: NodeJS.Platform): string {
         return this.nodeJsPlatformMapping[p] || 'unknown';
     }
 }