diff --git a/features/backoffice/site.feature b/features/backoffice/site.feature
index a4e0c068..4d55153c 100644
--- a/features/backoffice/site.feature
+++ b/features/backoffice/site.feature
@@ -3,21 +3,31 @@ Feature: Manage my site
   As an administrator
   I want to edit/delete my site
 
-Background:
-  Given I have the site: "test site" set up
-  And I am an authenticated user
+  Background:
+    Given I have the site: "test site" set up
 
-Scenario: Site settings are not accessible for non authenticated accounts
-  Given I am not authenticated
-  When I go to the site settings
-  Then I should see "You need to sign in or sign up before continuing"
+  Scenario: Site settings are not accessible for non authenticated accounts
+    Given I am not authenticated
+    When I go to the site settings
+    Then I should see "You need to sign in or sign up before continuing"
 
-Scenario: Add a new site
-  Given I go to the account settings
-  And I follow "new site"
-  Then I should see "Fill in the form below to create your new site."
-  When I fill in "Name" with "Acme"
-  And I fill in "Subdomain" with "acme"
-  And I press "Create"
-  Then I should see "Site was successfully created."
-  And I should be a administrator of the "Acme" site
+  Scenario: Add a new site
+    Given I am an authenticated user
+    When I go to the account settings
+    And I follow "new site"
+    Then I should see "Fill in the form below to create your new site."
+    When I fill in "Name" with "Acme"
+    And I fill in "Subdomain" with "acme"
+    And I press "Create"
+    Then I should see "Site was successfully created."
+    And I should be a administrator of the "Acme" site
+
+  @javascript
+  Scenario: Adding a domain to a site
+    Given I am an authenticated user
+    Then I should be able to add a domain to my site
+
+  @javascript
+  Scenario: Removing a domain from a site
+    Given I am an authenticated user
+    Then I should be able to remove a domain from my site
diff --git a/features/step_definitions/site_steps.rb b/features/step_definitions/site_steps.rb
index e5e6cb33..d78953fc 100644
--- a/features/step_definitions/site_steps.rb
+++ b/features/step_definitions/site_steps.rb
@@ -33,3 +33,29 @@ end
 Given /^a robot_txt set to "([^"]*)"$/ do |value|
   @site.update_attributes(:robots_txt => value)
 end
+
+
+Then /^I should be able to add a domain to my site$/ do
+  visit edit_current_site_path
+
+  fill_in 'domain', :with => 'monkeys.com'
+  click_link '+ add'
+  click_button 'Save'
+
+  page.should have_content 'My site was successfully updated'
+  @site.reload.domains.should include 'monkeys.com'
+end
+
+Then /^I should be able to remove a domain from my site$/ do
+  @site.domains = [ 'monkeys.com' ]
+  @site.save!
+
+  visit edit_current_site_path
+
+  click_link 'x'
+  click_button 'Save'
+
+  page.should have_content 'My site was successfully updated'
+  @site.reload.domains.should be_blank
+end
+