diff --git a/database-emulator/javascript-quickstart/README.md b/database-emulator/javascript-quickstart/README.md
index 20af6f59..704ed58c 100644
--- a/database-emulator/javascript-quickstart/README.md
+++ b/database-emulator/javascript-quickstart/README.md
@@ -6,13 +6,14 @@ Let's try writing some simple tests for our security rules.
 
 ### Install Node dependencies
 
-Run `npm install` from this directory.
+Run `npm install` from this directory, and make sure that you have a recent
+version of the [Firebase CLI tool](https://github.com/firebase/firebase-tools)
+installed (you'll need `firebase --version` to be at least `6.1.1`).
 
 ### Running the emulator
 
-Make sure you've Opted-in to the emulator beta:
+Download the database emulator
 ```
-firebase --open-sesame emulators
 firebase setup:emulators:database
 ```
 Start the database emulator (and leave it running during the tests)
diff --git a/database-emulator/typescript-quickstart/README.md b/database-emulator/typescript-quickstart/README.md
index 20af6f59..704ed58c 100644
--- a/database-emulator/typescript-quickstart/README.md
+++ b/database-emulator/typescript-quickstart/README.md
@@ -6,13 +6,14 @@ Let's try writing some simple tests for our security rules.
 
 ### Install Node dependencies
 
-Run `npm install` from this directory.
+Run `npm install` from this directory, and make sure that you have a recent
+version of the [Firebase CLI tool](https://github.com/firebase/firebase-tools)
+installed (you'll need `firebase --version` to be at least `6.1.1`).
 
 ### Running the emulator
 
-Make sure you've Opted-in to the emulator beta:
+Download the database emulator
 ```
-firebase --open-sesame emulators
 firebase setup:emulators:database
 ```
 Start the database emulator (and leave it running during the tests)
diff --git a/firestore-emulator/javascript-quickstart/README.md b/firestore-emulator/javascript-quickstart/README.md
index 2e021d55..557d056e 100644
--- a/firestore-emulator/javascript-quickstart/README.md
+++ b/firestore-emulator/javascript-quickstart/README.md
@@ -6,7 +6,9 @@ Let's try writing some simple tests for our security rules.
 
 ### Install Node dependencies
 
-Run `npm install` from this directory.
+Run `npm install` from this directory, and make sure that you have a recent
+version of the [Firebase CLI tool](https://github.com/firebase/firebase-tools)
+installed (you'll need `firebase --version` to be at least `6.1.1`).
 
 ### Running the emulator
 
diff --git a/firestore-emulator/typescript-quickstart/README.md b/firestore-emulator/typescript-quickstart/README.md
index 2e021d55..557d056e 100644
--- a/firestore-emulator/typescript-quickstart/README.md
+++ b/firestore-emulator/typescript-quickstart/README.md
@@ -6,7 +6,9 @@ Let's try writing some simple tests for our security rules.
 
 ### Install Node dependencies
 
-Run `npm install` from this directory.
+Run `npm install` from this directory, and make sure that you have a recent
+version of the [Firebase CLI tool](https://github.com/firebase/firebase-tools)
+installed (you'll need `firebase --version` to be at least `6.1.1`).
 
 ### Running the emulator