diff --git a/test/controllers/memberships_controller_test.rb b/test/controllers/memberships_controller_test.rb
index 3338656..ad66d22 100644
--- a/test/controllers/memberships_controller_test.rb
+++ b/test/controllers/memberships_controller_test.rb
@@ -17,7 +17,7 @@ class MembershipsControllerTest < ActionDispatch::IntegrationTest
 
   test "should create membership" do
     assert_difference("Membership.count") do
-      post memberships_url, params: { membership: { beer_club_id: @membership.beer_club_id, user_id: @membership.user_id } }
+      post memberships_url, params: { membership: { beerclub_id: @membership.beer_club_id, user_id: @membership.user_id } }
     end
 
     assert_redirected_to membership_url(Membership.last)
@@ -34,7 +34,7 @@ class MembershipsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should update membership" do
-    patch membership_url(@membership), params: { membership: { beer_club_id: @membership.beer_club_id, user_id: @membership.user_id } }
+    patch membership_url(@membership), params: { membership: { beerclub_id: @membership.beer_club_id, user_id: @membership.user_id } }
     assert_redirected_to membership_url(@membership)
   end
 
diff --git a/test/fixtures/memberships.yml b/test/fixtures/memberships.yml
index a87482d..8ed9463 100644
--- a/test/fixtures/memberships.yml
+++ b/test/fixtures/memberships.yml
@@ -2,8 +2,8 @@
 
 one:
   user_id: 1
-  beer_club_id: 1
+  beerclub_id: 1
 
 two:
   user_id: 1
-  beer_club_id: 1
+  beerclub_id: 1
diff --git a/test/system/memberships_test.rb b/test/system/memberships_test.rb
index 61bb302..b6decca 100644
--- a/test/system/memberships_test.rb
+++ b/test/system/memberships_test.rb
@@ -14,7 +14,7 @@ class MembershipsTest < ApplicationSystemTestCase
     visit memberships_url
     click_on "New membership"
 
-    fill_in "Beer club", with: @membership.beer_club_id
+    fill_in "Beer club", with: @membership.beerclub_id
     fill_in "User", with: @membership.user_id
     click_on "Create Membership"
 
@@ -26,7 +26,7 @@ class MembershipsTest < ApplicationSystemTestCase
     visit membership_url(@membership)
     click_on "Edit this membership", match: :first
 
-    fill_in "Beer club", with: @membership.beer_club_id
+    fill_in "Beer club", with: @membership.beerclub_id
     fill_in "User", with: @membership.user_id
     click_on "Update Membership"