diff --git a/lib/barby/barcode/bookland.rb b/lib/barby/barcode/bookland.rb
index af461d8..4362ce2 100644
--- a/lib/barby/barcode/bookland.rb
+++ b/lib/barby/barcode/bookland.rb
@@ -1,3 +1,4 @@
+#encoding: ASCII
 require 'barby/barcode/ean_13'
 
 module Barby
diff --git a/lib/barby/barcode/code_128.rb b/lib/barby/barcode/code_128.rb
index 75d23fd..7e47d5f 100644
--- a/lib/barby/barcode/code_128.rb
+++ b/lib/barby/barcode/code_128.rb
@@ -1,3 +1,4 @@
+#encoding: ASCII
 require 'barby/barcode'
 
 module Barby
diff --git a/lib/barby/barcode/code_39.rb b/lib/barby/barcode/code_39.rb
index 5758533..23e6a8b 100644
--- a/lib/barby/barcode/code_39.rb
+++ b/lib/barby/barcode/code_39.rb
@@ -1,3 +1,4 @@
+#encoding: ASCII
 require 'barby/barcode'
 
 module Barby
diff --git a/lib/barby/barcode/code_93.rb b/lib/barby/barcode/code_93.rb
index 9571c12..0c7d917 100644
--- a/lib/barby/barcode/code_93.rb
+++ b/lib/barby/barcode/code_93.rb
@@ -1,3 +1,4 @@
+#encoding: ASCII
 require 'barby/barcode'
 
 module Barby
diff --git a/lib/barby/barcode/data_matrix.rb b/lib/barby/barcode/data_matrix.rb
index 5005895..9bf9576 100644
--- a/lib/barby/barcode/data_matrix.rb
+++ b/lib/barby/barcode/data_matrix.rb
@@ -1,4 +1,4 @@
-require 'semacode'
+require 'semacode' #Ruby 1.8: gem install semacode - Ruby 1.9: gem install semacode-ruby19
 require 'barby/barcode'
 
 module Barby
diff --git a/test/barcodes.rb b/test/barcodes.rb
new file mode 100644
index 0000000..61b8ae2
--- /dev/null
+++ b/test/barcodes.rb
@@ -0,0 +1,19 @@
+require 'code_128_test'
+require 'gs1_128_test'
+
+require 'code_25_test'
+require 'code_25_interleaved_test'
+require 'code_25_iata_test'
+
+require 'code_39_test'
+require 'code_93_test'
+
+require 'ean13_test'
+require 'ean8_test'
+require 'bookland_test'
+require 'upc_supplemental_test'
+
+require 'data_matrix_test'
+require 'qr_code_test'
+
+#require 'pdf_417_test'
diff --git a/test/code_39_test.rb b/test/code_39_test.rb
index 2fff220..7d60de9 100644
--- a/test/code_39_test.rb
+++ b/test/code_39_test.rb
@@ -1,3 +1,4 @@
+#encoding: ASCII
 require 'test_helper'
 require 'barby/barcode/code_39'
 
diff --git a/test/code_93_test.rb b/test/code_93_test.rb
index 749b39b..5a9615b 100644
--- a/test/code_93_test.rb
+++ b/test/code_93_test.rb
@@ -1,3 +1,4 @@
+#encoding: ASCII
 require 'test_helper'
 require 'barby/barcode/code_93'
 
diff --git a/test/data_matrix_test.rb b/test/data_matrix_test.rb
index e65deea..6e971b7 100644
--- a/test/data_matrix_test.rb
+++ b/test/data_matrix_test.rb
@@ -1,34 +1,30 @@
-unless RUBY_VERSION >= '1.9'
+require 'test_helper'
+require 'barby/barcode/data_matrix'
 
-  require 'test_helper'
-  require 'barby/barcode/data_matrix'
+class DataMatrixTest < Barby::TestCase
 
-  class DataMatrixTest < Barby::TestCase
-
-    before do
-      @data = "humbaba"
-      @code = Barby::DataMatrix.new(@data)
-    end
-
-    it "should have the expected encoding" do
-      @code.encoding.must_equal ["1010101010101010", "1011111000011111", "1110111000010100",
-                                "1110100100000111", "1101111010101000", "1101111011110011",
-                                "1111111100000100", "1100101111110001", "1001000010001010",
-                                "1101010110111011", "1000000100011110", "1001010010000011",
-                                "1101100111011110", "1110111010000101", "1110010110001010",
-                                "1111111111111111"]
-    end
+  before do
+    @data = "humbaba"
+    @code = Barby::DataMatrix.new(@data)
+  end
 
-    it "should return data on to_s" do
-      @code.to_s.must_equal @data
-    end
+  it "should have the expected encoding" do
+    @code.encoding.must_equal ["1010101010101010", "1011111000011111", "1110111000010100",
+                              "1110100100000111", "1101111010101000", "1101111011110011",
+                              "1111111100000100", "1100101111110001", "1001000010001010",
+                              "1101010110111011", "1000000100011110", "1001010010000011",
+                              "1101100111011110", "1110111010000101", "1110010110001010",
+                              "1111111111111111"]
+  end
 
-    it "should be able to change its data" do
-      prev_encoding = @code.encoding
-      @code.data = "after eight"
-      @code.encoding.wont_equal prev_encoding
-    end
+  it "should return data on to_s" do
+    @code.to_s.must_equal @data
+  end
 
+  it "should be able to change its data" do
+    prev_encoding = @code.encoding
+    @code.data = "after eight"
+    @code.encoding.wont_equal prev_encoding
   end
 
 end
diff --git a/test/gs1_128_test.rb b/test/gs1_128_test.rb
index bf3575e..e66e2ee 100644
--- a/test/gs1_128_test.rb
+++ b/test/gs1_128_test.rb
@@ -1,3 +1,4 @@
+#encoding: ASCII
 require 'test_helper'
 require 'barby/barcode/gs1_128'
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 39e45f7..28169e2 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,4 @@
 require 'rubygems'
-require 'bundler'
-Bundler.setup
 require 'barby'
 require 'minitest/spec'
 require 'minitest/autorun'