diff --git a/src/ec_cmd_log.erl b/src/ec_cmd_log.erl
index 4c54086..66ee40c 100644
--- a/src/ec_cmd_log.erl
+++ b/src/ec_cmd_log.erl
@@ -243,7 +243,7 @@ term_capabilities(_) -> full. %% Default to the backwards compatible version.
 %%% Test Functions
 %%%===================================================================
 
--ifdef(DEV_ONLY).
+-ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 
 should_test() ->
diff --git a/src/ec_cnv.erl b/src/ec_cnv.erl
index 8976549..72700fb 100644
--- a/src/ec_cnv.erl
+++ b/src/ec_cnv.erl
@@ -217,7 +217,7 @@ to_atom(X) ->
 %%% Tests
 %%%===================================================================
 
--ifdef(DEV_ONLY).
+-ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 
 to_integer_test() ->
diff --git a/src/ec_date.erl b/src/ec_date.erl
index f04e399..c21c2a8 100644
--- a/src/ec_date.erl
+++ b/src/ec_date.erl
@@ -694,7 +694,7 @@ ltoi(X) ->
 %%% Tests
 %%%===================================================================
 
--ifdef(DEV_ONLY).
+-ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 
 
diff --git a/src/ec_file.erl b/src/ec_file.erl
index e283c64..46ed814 100644
--- a/src/ec_file.erl
+++ b/src/ec_file.erl
@@ -325,7 +325,7 @@ sub_files(From) ->
 %%% Test Functions
 %%%===================================================================
 
--ifdef(DEV_ONLY).
+-ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 
 setup_test() ->
diff --git a/src/ec_gb_trees.erl b/src/ec_gb_trees.erl
index a87ab86..7985fab 100644
--- a/src/ec_gb_trees.erl
+++ b/src/ec_gb_trees.erl
@@ -141,7 +141,7 @@ keys(Data) ->
 %%%===================================================================
 
 
--ifdef(DEV_ONLY).
+-ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 
 %% For me unit testing initially is about covering the obvious case. A
diff --git a/src/ec_lists.erl b/src/ec_lists.erl
index fd8fa5f..c95078b 100644
--- a/src/ec_lists.erl
+++ b/src/ec_lists.erl
@@ -68,7 +68,7 @@ fetch(Fun, List) when is_list(List), is_function(Fun) ->
 %%% Test Functions
 %%%===================================================================
 
--ifdef(DEV_ONLY).
+-ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 
 find1_test() ->
diff --git a/src/ec_semver.erl b/src/ec_semver.erl
index 23ba311..0298872 100644
--- a/src/ec_semver.erl
+++ b/src/ec_semver.erl
@@ -314,7 +314,7 @@ internal_pes(Vsn, LVsn) ->
 %%% Test Functions
 %%%===================================================================
 
--ifdef(DEV_ONLY).
+-ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 
 eql_test() ->
diff --git a/src/ec_talk.erl b/src/ec_talk.erl
index 5e24f2c..5d79b64 100644
--- a/src/ec_talk.erl
+++ b/src/ec_talk.erl
@@ -200,7 +200,7 @@ get_string(String) ->
 %%%====================================================================
 %%% tests
 %%%====================================================================
--ifdef(DEV_ONLY).
+-ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 
 general_test_() ->