diff --git a/.gitignore b/.gitignore
index 28a2b9b..dee7d67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ ebin/*.app
 *.beam
 *~
 deps
-*.so
\ No newline at end of file
+*.so
+_build
diff --git a/Makefile b/Makefile
index da20abf..31b4d63 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: compile xref eunit clean doc check make deps test
 
-REBAR=./rebar
+REBAR=./rebar3
 
 all: compile
 
@@ -18,11 +18,11 @@ deps:
 compile:
 	@$(REBAR) compile
 
-xref: compile
+xref:
 	@$(REBAR) xref
 
-test: compile xref
-	@./rebar eunit
+test:
+	@$(REBAR) eunit
 
 clean:
 	@$(REBAR) clean
diff --git a/rebar b/rebar
deleted file mode 100755
index c7d9352..0000000
Binary files a/rebar and /dev/null differ
diff --git a/rebar.config.script b/rebar.config.script
deleted file mode 100644
index 86ae113..0000000
--- a/rebar.config.script
+++ /dev/null
@@ -1,25 +0,0 @@
-case erlang:system_info(otp_release) of
-
-    %% Rxx, before R16
-    [$R|_] ->
-        HashDefine = [{d,without_map}],
-        case lists:keysearch(erl_opts, 1, CONFIG) of
-            {value, {erl_opts, Opts}} ->
-                lists:keyreplace(erl_opts,1,CONFIG,{erl_opts,Opts++HashDefine});
-            false ->
-                CONFIG ++ [{erl_opts, HashDefine}]
-        end;
-
-    %% In 17, maps are experimental
-    "17" ->
-        CONFIG;
-
-    _ ->
-        HashDefine = [{d,default_map}],
-        case lists:keysearch(erl_opts, 1, CONFIG) of
-            {value, {erl_opts, Opts}} ->
-                lists:keyreplace(erl_opts,1,CONFIG,{erl_opts,Opts++HashDefine});
-            false ->
-                CONFIG ++ [{erl_opts, HashDefine}]
-        end
-end.
diff --git a/rebar.lock b/rebar.lock
new file mode 100644
index 0000000..57afcca
--- /dev/null
+++ b/rebar.lock
@@ -0,0 +1 @@
+[].
diff --git a/rebar3 b/rebar3
new file mode 100755
index 0000000..c09bd55
Binary files /dev/null and b/rebar3 differ
diff --git a/test/msgpack_ext_example_tests.erl b/test/msgpack_ext_tests.erl
similarity index 99%
rename from test/msgpack_ext_example_tests.erl
rename to test/msgpack_ext_tests.erl
index 7fa2ad0..23c69aa 100644
--- a/test/msgpack_ext_example_tests.erl
+++ b/test/msgpack_ext_tests.erl
@@ -16,7 +16,7 @@
 %%    limitations under the License.
 %%
 
--module(msgpack_ext_example_tests).
+-module(msgpack_ext_tests).
 
 -compile(export_all).
 
diff --git a/test/msgpack_test.erl b/test/msgpack_tests.erl
similarity index 99%
rename from test/msgpack_test.erl
rename to test/msgpack_tests.erl
index 41c585c..f06ee41 100644
--- a/test/msgpack_test.erl
+++ b/test/msgpack_tests.erl
@@ -17,7 +17,7 @@
 %%
 %% Created : 26 Apr 2011 by UENISHI Kota <uenishi.kota@lab.ntt.co.jp>
 
--module(msgpack_test).
+-module(msgpack_tests).
 
 -import(msgpack, [pack/2, unpack/2, pack/1, unpack/1]).
 
@@ -172,7 +172,8 @@ issue_27_test_() ->
 
 string_test() ->
     {ok, CWD} = file:get_cwd(),
-    Path = CWD ++ "/../test/utf8.txt",
+    Path = CWD ++ "/test/utf8.txt",
+    %% ?debugVal(Path),
     {ok, UnicodeBin} = file:read_file(Path),
     String = unicode:characters_to_list(UnicodeBin),
     MsgpackStringBin = msgpack:pack(String),