diff --git a/tests/steps/given.js b/tests/steps/given.js
index 933a4c1..7c79ed8 100644
--- a/tests/steps/given.js
+++ b/tests/steps/given.js
@@ -19,6 +19,9 @@ let an_authenticated_user = function* () {
   let username  = `test-${firstName}-${lastName}-${chance.string({length: 8})}`;
   let password  = random_password();
   let email     = `${firstName}-${lastName}@big-mouth.com`;
+  
+  username = username.replace(' ', '').replace('@', '');
+  email = email.replace(' ', '');
 
   let createReq = {
     UserPoolId        : userpoolId,
@@ -72,4 +75,4 @@ let an_authenticated_user = function* () {
 
 module.exports = {
   an_authenticated_user
-};
\ No newline at end of file
+};