diff --git a/test/apps/rails3.1/app/controllers/mixins/user_mixin.rb b/test/apps/rails3.1/app/controllers/mixins/user_mixin.rb
index 2e62184d5221952bce3e61971426fc959149dad7..231902c4c0faf5383e99669ea74a23d7dbb91a23 100644
--- a/test/apps/rails3.1/app/controllers/mixins/user_mixin.rb
+++ b/test/apps/rails3.1/app/controllers/mixins/user_mixin.rb
@@ -9,4 +9,11 @@ module UserMixin
   def mixin_default
     @dangerous_input = params[:bad]
   end
+
+  def assign_if
+    @value = if something
+               this
+               that
+             end
+  end
 end
diff --git a/test/apps/rails3.1/app/controllers/users_controller.rb b/test/apps/rails3.1/app/controllers/users_controller.rb
index 6218aa59f9bf10d3cb93f0946b6370f969d2e8b6..c68493fd4a96f0e9bd74b02e80af3a25bd0b80ce 100644
--- a/test/apps/rails3.1/app/controllers/users_controller.rb
+++ b/test/apps/rails3.1/app/controllers/users_controller.rb
@@ -152,6 +152,9 @@ class UsersController < ApplicationController
     User.update_all({:admin => true}, { :name => params[:name] }, :limit => params[:limit])
   end
 
+  def test_assign_if
+  end
+
   private
 
   def simple_helper
@@ -175,4 +178,6 @@ class UsersController < ApplicationController
   end
 
   include UserMixin
+
+  before_filter :assign_if, :only => :test_assign_if
 end
diff --git a/test/apps/rails3.1/app/views/users/test_assign_if.html.erb b/test/apps/rails3.1/app/views/users/test_assign_if.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..d568b87b40cb85d13471d853eca46bda961a27bf
--- /dev/null
+++ b/test/apps/rails3.1/app/views/users/test_assign_if.html.erb
@@ -0,0 +1 @@
+<%= @value %>
diff --git a/test/tests/test_rails31.rb b/test/tests/test_rails31.rb
index 75a592fe1bf3afda9bcac69466dbc28bd83c7617..f96636f49fee22195312dcf287529a13c2309a62 100644
--- a/test/tests/test_rails31.rb
+++ b/test/tests/test_rails31.rb
@@ -890,7 +890,7 @@ class Rails31Tests < Test::Unit::TestCase
   def test_sql_injection_in_pluck
     assert_warning :type => :warning,
       :warning_type => "SQL Injection",
-      :line => 174,
+      :line => 177,
       :message => /^Possible\ SQL\ injection/,
       :confidence => 0,
       :file => /users_controller\.rb/