diff --git a/app/assets/javascripts/app/views/aspect_membership_view.js b/app/assets/javascripts/app/views/aspect_membership_view.js
index 34ba8bd77..b5017bec6 100644
--- a/app/assets/javascripts/app/views/aspect_membership_view.js
+++ b/app/assets/javascripts/app/views/aspect_membership_view.js
@@ -144,7 +144,7 @@ app.views.AspectMembership = app.views.Base.extend({
 
     this.render();
     // we just removed the last aspect, inform the user with a flash message
-    // that he is no longer sharing with that person
+    // that they are no longer sharing with that person
     if (this.$el.find("li.selected").length === 0) {
       var msg = Diaspora.I18n.t("aspect_dropdown.stopped_sharing_with", { "name": this._name() });
       stopSharing = true;
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index 4b9e22ce5..4d692e978 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -81,7 +81,7 @@ describe CommentsController, :type => :controller do
         sign_in bob, scope: :user
       end
 
-      it 'lets the user delete his comment' do
+      it "lets the user delete their comment" do
         comment = bob.comment!(@message, "hey")
 
         expect(bob).to receive(:retract).with(comment)
@@ -99,7 +99,7 @@ describe CommentsController, :type => :controller do
     end
 
     context "another user's post" do
-      it 'let the user delete his comment' do
+      it "lets the user delete their comment" do
         comment = alice.comment!(@message, "hey")
 
         expect(alice).to receive(:retract).with(comment)
@@ -107,7 +107,7 @@ describe CommentsController, :type => :controller do
         expect(response.status).to eq(204)
       end
 
-      it 'does not let the user destroy comments he does not own' do
+      it "does not let the user destroy comments they do not own" do
         comment1 = bob.comment!(@message, "hey")
         comment2 = eve.comment!(@message, "hey")
 
diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb
index d323ba87b..11b52914a 100644
--- a/spec/controllers/photos_controller_spec.rb
+++ b/spec/controllers/photos_controller_spec.rb
@@ -173,7 +173,7 @@ describe PhotosController, :type => :controller do
   end
 
   describe '#destroy' do
-    it 'let a user delete his message' do
+    it "lets a user delete their message" do
       delete :destroy, params: {id: @alices_photo.id}
       expect(Photo.find_by_id(@alices_photo.id)).to be_nil
     end
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index e3ef6a785..c18d918d9 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -144,7 +144,7 @@ describe UsersController, :type => :controller do
     end
 
     describe 'language' do
-      it 'allow the user to change his language' do
+      it "allows the user to change their language" do
         old_language = 'en'
         @user.language = old_language
         @user.save
@@ -155,7 +155,7 @@ describe UsersController, :type => :controller do
     end
 
     describe "color_theme" do
-      it "allow the user to change his color theme" do
+      it "allows the user to change their color theme" do
         old_color_theme = "original"
         @user.color_theme = old_color_theme
         @user.save
@@ -166,14 +166,14 @@ describe UsersController, :type => :controller do
     end
 
     describe 'email' do
-      it 'disallow the user to change his new (unconfirmed) mail when it is the same as the old' do
+      it "disallows the user to change their new (unconfirmed) mail when it is the same as the old" do
         @user.email = "my@newemail.com"
         put :update, params: {id: @user.id, user: {email: "my@newemail.com"}}
         @user.reload
         expect(@user.unconfirmed_email).to eql(nil)
       end
 
-      it 'allow the user to change his (unconfirmed) email' do
+      it "allows the user to change their (unconfirmed) email" do
         put :update, params: {id: @user.id, user: {email: "my@newemail.com"}}
         @user.reload
         expect(@user.unconfirmed_email).to eql("my@newemail.com")
@@ -191,7 +191,7 @@ describe UsersController, :type => :controller do
         expect(request.flash[:notice]).to be_blank
       end
 
-      it 'allow the user to change his (unconfirmed) email to blank (= abort confirmation)' do
+      it "allow the user to change their (unconfirmed) email to blank (= abort confirmation)" do
         put :update, params: {id: @user.id, user: {email: ""}}
         @user.reload
         expect(@user.unconfirmed_email).to eql(nil)
diff --git a/spec/integration/federation/shared_receive_relayable.rb b/spec/integration/federation/shared_receive_relayable.rb
index 2d0e150ba..4fc8f7de1 100644
--- a/spec/integration/federation/shared_receive_relayable.rb
+++ b/spec/integration/federation/shared_receive_relayable.rb
@@ -36,7 +36,7 @@ shared_examples_for "it deals correctly with a relayable" do
     end
 
     # Checks when a remote pod B wants to send us a relayable with authorship from a remote pod C user
-    # without having correct signature from him.
+    # without having a correct signature for them.
     it "rejects a downstream entity with a malformed author signature" do
       expect(Workers::ReceiveLocal).not_to receive(:perform_async)
       allow(remote_user_on_pod_c).to receive(:encryption_key).and_return(OpenSSL::PKey::RSA.new(1024))
diff --git a/spec/services/post_service_spec.rb b/spec/services/post_service_spec.rb
index 5dd889b72..2ee820ec1 100644
--- a/spec/services/post_service_spec.rb
+++ b/spec/services/post_service_spec.rb
@@ -332,7 +332,7 @@ describe PostService do
           end
         end
 
-        shared_examples "current user can't mention himself" do
+        shared_examples "current user can't mention themself" do
           before do
             current_user.profile.update(first_name: "Ro#{r_str}")
           end
@@ -345,7 +345,7 @@ describe PostService do
         context "when current user is a post author" do
           let(:post_author) { current_user.person }
 
-          include_examples "current user can't mention himself"
+          include_examples "current user can't mention themself"
         end
 
         context "current user is a participant" do
@@ -354,11 +354,11 @@ describe PostService do
             current_user.comment!(post, "hello")
           end
 
-          include_examples "current user can't mention himself"
+          include_examples "current user can't mention themself"
         end
 
         context "current user is a stranger matching a search pattern" do
-          include_examples "current user can't mention himself"
+          include_examples "current user can't mention themself"
         end
 
         it "doesn't fail when the post author doesn't match the requested pattern" do