diff --git a/.travis.yml b/.travis.yml
index 2eec06a4f..3326053a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 language: ruby
 
+gemfile:
+  - Gemfile
+  - Gemfile.1.8.7
+
 rvm:
   - 1.8.7
   - 1.9.2
@@ -8,9 +12,20 @@ rvm:
 
 script: FOG_MOCK=true bundle exec shindont
 
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      gemfile: Gemfile
+    - rvm: 1.9.2
+      gemfile: Gemfile.1.8.7
+    - rvm: 1.9.3
+      gemfile: Gemfile.1.8.7
+    - rvm: 2.0.0
+      gemfile: Gemfile.1.8.7
+
 notifications:
   email: false
-  irc: 
+  irc:
     channels:
       - "irc.freenode.org#ruby-fog"
     template:
diff --git a/Gemfile.1.8.7 b/Gemfile.1.8.7
new file mode 100644
index 000000000..6994674b0
--- /dev/null
+++ b/Gemfile.1.8.7
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'nokogiri', '~>1.5.0'
+
+gemspec