diff --git a/packages/generator-feathers/generators/app/index.js b/packages/generator-feathers/generators/app/index.js
index e1d0483e1f..0710e27bdc 100644
--- a/packages/generator-feathers/generators/app/index.js
+++ b/packages/generator-feathers/generators/app/index.js
@@ -192,7 +192,7 @@ module.exports = generators.Base.extend({
       }
     ];
 
-    this.prompt(prompts, function (props) {
+    this.prompt(prompts).then(function (props) {
       this.props = assign(this.props, props);
       this.props.databaseName = S(this.props.name).camelize().s;
       this.props.babel = process.versions.node < '5.0.0';
diff --git a/packages/generator-feathers/generators/hook/index.js b/packages/generator-feathers/generators/hook/index.js
index c3e58ee11a..89a46351da 100644
--- a/packages/generator-feathers/generators/hook/index.js
+++ b/packages/generator-feathers/generators/hook/index.js
@@ -110,7 +110,7 @@ module.exports = generators.Base.extend({
       }
     ];
 
-    this.prompt(prompts, function (props) {
+    this.prompt(prompts).then(function (props) {
       this.props = assign(this.props, props);
 
       done();
diff --git a/packages/generator-feathers/generators/middleware/index.js b/packages/generator-feathers/generators/middleware/index.js
index 87f999a7e0..5a21442c75 100644
--- a/packages/generator-feathers/generators/middleware/index.js
+++ b/packages/generator-feathers/generators/middleware/index.js
@@ -45,7 +45,7 @@ module.exports = generators.Base.extend({
       }
     ];
 
-    this.prompt(prompts, function (props) {
+    this.prompt(prompts).then(function (props) {
       this.props = assign(this.props, props);
 
       done();
diff --git a/packages/generator-feathers/generators/model/index.js b/packages/generator-feathers/generators/model/index.js
index a488f652dc..a6bf1ef6af 100644
--- a/packages/generator-feathers/generators/model/index.js
+++ b/packages/generator-feathers/generators/model/index.js
@@ -68,7 +68,7 @@ module.exports = generators.Base.extend({
       }
     ];
 
-    this.prompt(prompts, function (props) {
+    this.prompt(prompts).then(function (props) {
       this.props = assign(this.props, props);
       this.props.pluralizedName = inflect.pluralize(this.props.name);
 
diff --git a/packages/generator-feathers/generators/service/index.js b/packages/generator-feathers/generators/service/index.js
index 6cfebe7f35..25afc48670 100644
--- a/packages/generator-feathers/generators/service/index.js
+++ b/packages/generator-feathers/generators/service/index.js
@@ -121,7 +121,7 @@ module.exports = generators.Base.extend({
       }
     ];
 
-    this.prompt(prompts, function (props) {
+    this.prompt(prompts).then(function (props) {
       this.props = assign(this.props, props);
       done();
     }.bind(this));
diff --git a/packages/generator-feathers/lib/updateMixin.js b/packages/generator-feathers/lib/updateMixin.js
index 38d2722a06..b1d25c499e 100644
--- a/packages/generator-feathers/lib/updateMixin.js
+++ b/packages/generator-feathers/lib/updateMixin.js
@@ -69,7 +69,7 @@ var notifyUpdate = function(cb) {
                     }
                   ]
                 }];
-                this.prompt(prompts, function (props) {
+                this.prompt(prompts).then(function (props) {
                   if(props.updateGenerator === 'yes') {
                     spawn('npm', ['install', '-g', 'generator-feathers'], {stdio: 'inherit'})
                       .on('close', function(){
diff --git a/packages/generator-feathers/package.json b/packages/generator-feathers/package.json
index 42c809ad9b..438a39467c 100644
--- a/packages/generator-feathers/package.json
+++ b/packages/generator-feathers/package.json
@@ -62,7 +62,7 @@
     "string": "^3.3.1",
     "string-length": "^1.0.1",
     "update-notifier": "^0.6.1",
-    "yeoman-generator": "^0.22.5"
+    "yeoman-generator": "^0.23.3"
   },
   "devDependencies": {
     "babel-cli": "^6.6.5",
@@ -70,6 +70,6 @@
     "babel-preset-es2015": "^6.6.0",
     "jshint": "^2.9.2",
     "mocha": "^2.4.5",
-    "yeoman-test": "^1.1.0"
+    "yeoman-test": "^1.4.0"
   }
 }