diff --git a/.travis.yml b/.travis.yml
index cb4613b..0ecaec7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,6 @@ otp_release:
   - R16B02
 before_install:
   - git clone https://github.com/elixir-lang/elixir
-  - cd elixir && git checkout v0.11.2 && make && cd ..
+  - cd elixir && git checkout v0.12.1 && make && cd ..
 before_script: "export PATH=`pwd`/elixir/bin:$PATH"
 script: "MIX_ENV=test mix do deps.get, test --no-start"
diff --git a/mix.exs b/mix.exs
index 3f4043b..6d2ffba 100644
--- a/mix.exs
+++ b/mix.exs
@@ -5,7 +5,7 @@ defmodule Httparrot.Mixfile do
     [ app: :httparrot,
       version: "0.0.1",
       name: "HTTParrot",
-      elixir: "~> 0.11.2",
+      elixir: "~> 0.11.2 or ~> 0.12.0",
       deps: deps(Mix.env) ]
   end