diff --git a/composer.json b/composer.json
index 8f4914c..b937fc8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name": "buddypress/wp-cli-buddypress",
 	"type": "wp-cli-package",
-	"description": "WP-CLI commands for BuddyPress",
+	"description": "WP-CLI Community Package of BuddyPress commands",
 	"keywords": [ "wp-cli", "buddypress", "community", "wordpress", "bp" ],
 	"homepage": "https://github.com/buddypress/wp-cli-buddypress",
 	"license": "MIT",
diff --git a/features/xprofile-data.feature b/features/xprofile-data.feature
index 31717a1..7eff3df 100644
--- a/features/xprofile-data.feature
+++ b/features/xprofile-data.feature
@@ -17,33 +17,33 @@ Feature: Manage BuddyPress XProfile Data
 
     When I run `wp bp xprofile data set --field-id={FIELD_ID} --user-id={USER_ID} --value=foo`
     Then STDOUT should contain:
-        """
-	Updated
-	"""
+      """
+	    Updated
+	    """
 
     When I run `wp bp xprofile data get --user-id={USER_ID} --field-id={FIELD_ID}`
     Then STDOUT should be:
-        """
-	foo
-	"""
+      """
+	    foo
+	    """
 
     When I run `wp bp xprofile data get --user-id={USER_ID}`
     Then STDOUT should be a table containing rows:
         | field_id   | field_name | value |
-	| {FIELD_ID} | Field Name | "foo" |
+	      | {FIELD_ID} | Field Name | "foo" |
 
     When I try `wp bp xprofile data delete --user-id={USER_ID} --yes`
     Then the return code should be 1
     Then STDERR should contain:
         """
-	Either --field-id or --delete-all must be provided
-	"""
+	     Either --field-id or --delete-all must be provided
+	     """
 
     When I run `wp bp xprofile data delete --user-id={USER_ID} --field-id={FIELD_ID} --yes`
     Then STDOUT should contain:
         """
-	XProfile data removed
-	"""
+	      XProfile data removed
+	      """
 
     When I run `wp bp xprofile data get --user-id={USER_ID} --field-id={FIELD_ID}`
     Then STDOUT should not contain:
diff --git a/features/xprofile-field.feature b/features/xprofile-field.feature
index d860d94..236d685 100644
--- a/features/xprofile-field.feature
+++ b/features/xprofile-field.feature
@@ -21,9 +21,9 @@ Feature: Manage BuddyPress XProfile Fields
 
     When I run `wp bp xprofile field delete {FIELD_ID} --yes`
     Then STDOUT should contain:
-       """
-       Deleted XProfile field
-       """
+      """
+      Deleted XProfile field
+      """
 
     When I try `wp bp xprofile field delete {FIELD_ID} --yes`
     Then the return code should be 1
diff --git a/features/xprofile-group.feature b/features/xprofile-group.feature
index 4affecd..9406f53 100644
--- a/features/xprofile-group.feature
+++ b/features/xprofile-group.feature
@@ -9,18 +9,18 @@ Feature: Manage BuddyPress XProfile Groups
 
     When I run `wp bp xprofile group get {GROUP_ID}`
     Then STDOUT should be a table containing rows:
-        | Field        | Value             |
-        | id           | {GROUP_ID}        |
-        | name         | Group Name        |
-        | description  | Group Description |
-        | can_delete   | 1                 |
-        | group_order  | 0                 |
+      | Field        | Value             |
+      | id           | {GROUP_ID}        |
+      | name         | Group Name        |
+      | description  | Group Description |
+      | can_delete   | 1                 |
+      | group_order  | 0                 |
 
     When I run `wp bp xprofile group delete {GROUP_ID} --yes`
     Then STDOUT should contain:
-        """
-	Field group deleted.
-	"""
+      """
+	    Field group deleted.
+	    """
 
     When I try `wp bp xprofile group get {GROUP_ID}`
     Then the return code should be 1
diff --git a/wp-cli.yml b/wp-cli.yml
new file mode 100644
index 0000000..6e859c1
--- /dev/null
+++ b/wp-cli.yml
@@ -0,0 +1,2 @@
+require:
+  - wp-cli-bp.php