diff --git a/Gemfile b/Gemfile
index 12dc4db09eb..6598693c7fc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -101,8 +101,8 @@ group :test, :development do
   gem 'guard-spork', require: false
   gem 'jasminerice'
   gem 'mocha', require: false
-  gem 'rb-fsevent', require: false
-  gem 'rb-inotify', '~> 0.9', require: false
+  gem 'rb-fsevent', require: RUBY_PLATFORM =~ /darwin/i ? 'rb-fsevent' : false
+  gem 'rb-inotify', '~> 0.9', require: RUBY_PLATFORM =~ /linux/i ? 'rb-inotify' : false
   gem 'rspec-rails', require: false
   gem 'shoulda', require: false
   gem 'simplecov', require: false
diff --git a/Guardfile b/Guardfile
index 74368bc636e..c118d339ee0 100644
--- a/Guardfile
+++ b/Guardfile
@@ -1,4 +1,3 @@
-require 'rb-inotify' if RUBY_PLATFORM.include?('linux')
 require 'terminal-notifier-guard' if RUBY_PLATFORM.include?('darwin')
 
 phantom_path = File.expand_path('~/phantomjs/bin/phantomjs')