diff --git a/lib/compass/dependencies.rb b/lib/compass/dependencies.rb
index c1087145..802a5a99 100644
--- a/lib/compass/dependencies.rb
+++ b/lib/compass/dependencies.rb
@@ -1,3 +1,9 @@
-require 'rubygems'
-gem 'haml-edge','>= 2.1'
-require 'sass'
\ No newline at end of file
+unless defined?(Sass)
+  require 'rubygems'
+  begin
+    gem 'haml-edge','>= 2.1'
+  rescue Exception
+    $stderr.puts "WARNING: haml-edge gem not found. Trying to find haml on the load path."
+  end
+  require 'sass'
+end
\ No newline at end of file
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 2c9570f6..2d776986 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -17,6 +17,7 @@ linked_haml = File.dirname(__FILE__) + '/haml'
 if File.exists?(linked_haml) && !$:.include?(linked_haml + '/lib')
   puts "[ using linked Haml ]"
   $:.unshift linked_haml + '/lib'
+  require 'sass'
 else
   need_gems = true
 end