2 files changed, 11 insertions, 3 deletions
diff --git a/activesupport/test/cache/behaviors/cache_increment_decrement_behavior.rb b/activesupport/test/cache/behaviors/cache_increment_decrement_behavior.rb
index 2fa2d7af88..16b7abc679 100644
--- a/activesupport/test/cache/behaviors/cache_increment_decrement_behavior.rb
+++ b/activesupport/test/cache/behaviors/cache_increment_decrement_behavior.rb
@@ -8,7 +8,9 @@ module CacheIncrementDecrementBehavior
     assert_equal 2, @cache.read("foo").to_i
     assert_equal 3, @cache.increment("foo")
     assert_equal 3, @cache.read("foo").to_i
-    assert_nil @cache.increment("bar")
+
+    missing = @cache.increment("bar")
+    assert(missing.nil? || missing == 1)
   end
 
   def test_decrement
@@ -18,6 +20,8 @@ module CacheIncrementDecrementBehavior
     assert_equal 2, @cache.read("foo").to_i
     assert_equal 1, @cache.decrement("foo")
     assert_equal 1, @cache.read("foo").to_i
-    assert_nil @cache.decrement("bar")
+
+    missing = @cache.decrement("bar")
+    assert(missing.nil? || missing == -1)
   end
 end
diff --git a/activesupport/test/cache/behaviors/local_cache_behavior.rb b/activesupport/test/cache/behaviors/local_cache_behavior.rb
index 8dec8090b1..f7302df4c8 100644
--- a/activesupport/test/cache/behaviors/local_cache_behavior.rb
+++ b/activesupport/test/cache/behaviors/local_cache_behavior.rb
@@ -20,7 +20,11 @@ module LocalCacheBehavior
   end
 
   def test_cleanup_clears_local_cache_but_not_remote_cache
-    skip unless @cache.class.instance_methods(false).include?(:cleanup)
+    begin
+      @cache.cleanup
+    rescue NotImplementedError
+      skip
+    end
 
     @cache.with_local_cache do
       @cache.write("foo", "bar")