diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 93044b6..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "Azurite"]
-	path = Azurite
-	url = https://github.com/Azure/Azurite
diff --git a/Azurite b/Azurite
deleted file mode 160000
index d13cd73..0000000
--- a/Azurite
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d13cd730a14db7c77a975a591abbfb8472d9c4ef
diff --git a/README.md b/README.md
index 1bcce3c..9a8e1fe 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,14 @@ To build Streamstone binaries on Windows you will need to have Visual Studio 17
 
 ## Running unit tests
 
-Unit tests require Azure Storage Emulator 5.2 or higher, which is currently available only on Windows. Alternatively, you could run against real Azure by setting storage account connection string to **Streamstone-Test-Storage** user-level environment variable.
+### Windows/Linux/MacOs
+
+Use Azurite [npm](https://www.npmjs.com/package/azurite#npm) package to run tests and example app against an emulated table storage service. 
+
+WARNING: Azurite doesn't fully emulate Azure Table Storage functionality so you may have some of the tests failing.
+
+NOTE: Alternatively, you could run against real Azure by setting storage account connection string to **Streamstone-Test-Storage** user-level environment variable.
+
 
 ## Design
 
diff --git a/appveyor.yml b/appveyor.yml
index b7fae7c..8b872e3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,12 +14,7 @@ install:
   - sh: sudo apt-get update && sudo apt-get install -y dotnet-sdk-8.0
 
 build_script:
-    - git submodule init
-    - git submodule update
-    - cd Azurite
-    - npm ci
-    - npm run build
-    - npm install -g
+    - npm install -g azurite
     - (exec azurite -l ~/.data &)
     - sleep 5
     - cd ..