diff --git a/.travis.yml b/.travis.yml
index 6531e7a..c934f82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,5 @@ language: ruby
 rvm:
   - "1.9.3"
   - "2.0.0"
-install:
-  - bundle install
 script:
-  - bundle exec rake ci
+  - rake ci
diff --git a/Gemfile b/Gemfile
deleted file mode 100644
index 14d3b03..0000000
--- a/Gemfile
+++ /dev/null
@@ -1,4 +0,0 @@
-source "http://rubygems.org/"
-
-gem "rake"
-gem "test-unit", "2.4.3"
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index fab1350..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,12 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    rake (10.3.2)
-    test-unit (2.4.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake
-  test-unit (= 2.4.3)
diff --git a/rakefile.rb b/Rakefile
similarity index 84%
rename from rakefile.rb
rename to Rakefile
index bdb4931..8364ef5 100644
--- a/rakefile.rb
+++ b/Rakefile
@@ -24,8 +24,13 @@ task :prepare_for_tests => TEMP_DIRS
 
 include RakefileHelpers
 
-# Load default configuration, for now
-DEFAULT_CONFIG_FILE = 'gcc_32.yml'
+# Load proper GCC as defult configuration
+if 1.size == 8 # 8 bytes => 64-bits
+  DEFAULT_CONFIG_FILE = 'gcc_64.yml'
+else # Assume 32-bit otherwise
+  DEFAULT_CONFIG_FILE = 'gcc_32.yml'
+end
+
 configure_toolchain(DEFAULT_CONFIG_FILE)
 
 desc "Test unity with its own unit tests"