diff --git a/dev/system-test/firestore.ts b/dev/system-test/firestore.ts
index 22e37750b..12a43e478 100644
--- a/dev/system-test/firestore.ts
+++ b/dev/system-test/firestore.ts
@@ -77,6 +77,22 @@ class DeferredPromise<T> {
   }
 }
 
+const firestoreEnv: {
+  [key: string]: string | undefined;
+} = {};
+for (const key in process.env) {
+  if (key.startsWith('FIRESTORE')) {
+    firestoreEnv[key] = process.env[key];
+  }
+}
+console.log(
+  `Running system tests with environment variables:\n ${JSON.stringify(
+    firestoreEnv,
+    null,
+    2
+  )}`
+);
+
 if (process.env.NODE_ENV === 'DEBUG') {
   setLogFunction(console.log);
 }
diff --git a/package.json b/package.json
index aadc559ff..7d6b0678d 100644
--- a/package.json
+++ b/package.json
@@ -31,11 +31,15 @@
     "predocs": "npm run compile",
     "docs": "jsdoc -c .jsdoc.js",
     "system-test:rest": "FIRESTORE_PREFER_REST=true mocha build/system-test --timeout 600000",
+    "system-test:named-db:rest": "FIRESTORE_NAMED_DATABASE=test-db FIRESTORE_PREFER_REST=true mocha build/system-test --timeout 600000",
     "system-test:grpc": "mocha build/system-test --timeout 600000",
+    "system-test:named-db:grpc": "FIRESTORE_NAMED_DATABASE=test-db mocha build/system-test --timeout 600000",
     "system-test:emulator:rest": "FIRESTORE_EMULATOR_HOST=localhost:8080 FIRESTORE_PREFER_REST=true mocha build/system-test --timeout 600000",
+    "system-test:named-db:emulator:rest": "FIRESTORE_NAMED_DATABASE=test-db FIRESTORE_EMULATOR_HOST=localhost:8080 FIRESTORE_PREFER_REST=true mocha build/system-test --timeout 600000",
     "system-test:emulator:grpc": "FIRESTORE_EMULATOR_HOST=localhost:8080 mocha build/system-test --timeout 600000",
-    "system-test": "npm run system-test:grpc && npm run system-test:rest",
-    "system-test:emulator": "npm run system-test:emulator:grpc && npm run system-test:emulator:rest",
+    "system-test:named-db:emulator:grpc": "FIRESTORE_NAMED_DATABASE=test-db FIRESTORE_EMULATOR_HOST=localhost:8080 mocha build/system-test --timeout 600000",
+    "system-test": "npm run system-test:grpc && npm run system-test:rest && npm run system-test:named-db:grpc && npm run system-test:named-db:rest",
+    "system-test:emulator": "npm run system-test:emulator:grpc && npm run system-test:emulator:rest && npm run system-test:named-db:emulator:grpc && npm run system-test:named-db:emulator:rest",
     "presystem-test": "npm run compile",
     "samples-test": "npm link && cd samples/ && npm link ../ && npm test && cd ../",
     "conformance": "mocha build/conformance",