diff --git a/app/assets/javascripts/app/views/signup.jst.eco b/app/assets/javascripts/app/views/signup.jst.eco
index b4a1db8a2..09348e852 100644
--- a/app/assets/javascripts/app/views/signup.jst.eco
+++ b/app/assets/javascripts/app/views/signup.jst.eco
@@ -1,7 +1,7 @@
 <div class="fullHeight vertical center justified signup fit">
   <div class="hero-unit">
     <h1><%- @T( 'Join' ) %> <%= @C( 'product_name' ) %></h1>
-      <form>
+      <form class="signup">
         <div class="form-controls">
           <a class="subtle-link standalone pull-left" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
           <button class="btn btn-primary submit pull-right"><%- @T( 'Create my account' ) %></button>
diff --git a/test/browser/signup_test.rb b/test/browser/signup_test.rb
index 2b0023da6..e038a5f81 100644
--- a/test/browser/signup_test.rb
+++ b/test/browser/signup_test.rb
@@ -16,7 +16,7 @@ class SignupTest < TestCase
           },
           {
             :execute => 'check',
-            :css     => '#form-signup',
+            :css     => '.signup',
             :result  => true,
           },
         ],
@@ -61,12 +61,13 @@ class SignupTest < TestCase
           # check action
           {
             :execute => 'check',
-            :css     => '#form-signup',
+            :css     => '.signup',
             :result  => false,
           },
           {
             :execute      => 'match',
-            :css          => 'body',
+            :css          => '.user-menu .user a',
+            :attribute    => 'title',
             :value        => signup_user_email,
             :match_result => true,
           },