diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..5d1263484
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/test/gemfiles/5.1.gemfile b/test/gemfiles/5.1.gemfile
index 29ce89d3c..0163f2539 100644
--- a/test/gemfiles/5.1.gemfile
+++ b/test/gemfiles/5.1.gemfile
@@ -12,6 +12,6 @@ group :test do
   gem "diffy"
   gem "equivalent-xml"
   gem "mocha"
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3", "~> 1.4"
   gem "timecop", "~> 0.7.1"
 end
diff --git a/test/gemfiles/5.2.gemfile b/test/gemfiles/5.2.gemfile
index 57018b5e0..9812577ba 100644
--- a/test/gemfiles/5.2.gemfile
+++ b/test/gemfiles/5.2.gemfile
@@ -12,6 +12,6 @@ group :test do
   gem "diffy"
   gem "equivalent-xml"
   gem "mocha"
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3", "~> 1.4"
   gem "timecop", "~> 0.7.1"
 end