diff --git a/priv/uuid_repo/migrations/20170525142612_create_versions.exs b/priv/uuid_repo/migrations/20170525142612_create_versions.exs
index f32c3152..2cd73187 100644
--- a/priv/uuid_repo/migrations/20170525142612_create_versions.exs
+++ b/priv/uuid_repo/migrations/20170525142612_create_versions.exs
@@ -5,7 +5,7 @@ defmodule PaperTrail.UUIDRepo.Migrations.CreateVersions do
     create table(:versions) do
       add :event,        :string, null: false, size: 10
       add :item_type,    :string, null: false
-      add :item_id,      (if System.get_env("STR") == nil, do: :binary_id, else: :string)
+      add :item_id,      (if System.get_env("STRING_TEST") == nil, do: :binary_id, else: :string)
       add :item_changes, :map, null: false
       add :originator_id, references(:admins, type: :binary_id)
       add :origin,       :string, size: 50
diff --git a/test/paper_trail/uuid_test.exs b/test/paper_trail/uuid_test.exs
index e53310ae..e4df6d86 100644
--- a/test/paper_trail/uuid_test.exs
+++ b/test/paper_trail/uuid_test.exs
@@ -8,7 +8,7 @@ defmodule PaperTrailTest.UUIDTest do
     Application.put_env(:paper_trail, :repo, PaperTrail.UUIDRepo)
     Application.put_env(:paper_trail, :originator, name: :admin, model: Admin)
     Application.put_env(:paper_trail, :originator_type, Ecto.UUID)
-    Application.put_env(:paper_trail, :item_type, (if System.get_env("STR") == nil, do: Ecto.UUID, else: :string))
+    Application.put_env(:paper_trail, :item_type, (if System.get_env("STRING_TEST") == nil, do: Ecto.UUID, else: :string))
     Code.eval_file("lib/paper_trail.ex")
     Code.eval_file("lib/version.ex")
     repo().delete_all(Version)
@@ -59,7 +59,7 @@ defmodule PaperTrailTest.UUIDTest do
     assert version.item_id == item.item_id
   end
 
-  test "versioning models that have a integer primary key" do
+  test "test INTEGER primary key for item_type == :string" do
     if PaperTrail.Version.__schema__(:type, :item_id) == :string do
       item =
         %FooItem{}
@@ -71,7 +71,7 @@ defmodule PaperTrailTest.UUIDTest do
     end
   end
 
-  test "versionming models that have a string primary key" do
+  test "test STRING primary key for item_type == :string" do
     if PaperTrail.Version.__schema__(:type, :item_id) == :string do
       item =
         %BarItem{}