diff --git a/test/elixir/test/reshard_all_docs_test.exs b/test/elixir/test/reshard_all_docs_test.exs
index 042437e6eea..bd3893dd591 100644
--- a/test/elixir/test/reshard_all_docs_test.exs
+++ b/test/elixir/test/reshard_all_docs_test.exs
@@ -6,6 +6,7 @@ defmodule ReshardAllDocsTest do
   Test _all_docs interaction with resharding
   """
 
+  @moduletag :reshard_all_docs
   @moduletag kind: :cluster
 
   setup do
diff --git a/test/elixir/test/reshard_basic_test.exs b/test/elixir/test/reshard_basic_test.exs
index 92f8145bf78..6d91818f289 100644
--- a/test/elixir/test/reshard_basic_test.exs
+++ b/test/elixir/test/reshard_basic_test.exs
@@ -6,6 +6,7 @@ defmodule ReshardBasicTest do
   Test resharding basic functionality
   """
   
+  @moduletag :reshard_basic
   @moduletag kind: :cluster
 
   setup_all do
diff --git a/test/elixir/test/reshard_changes_feed.exs b/test/elixir/test/reshard_changes_feed.exs
index ad55e577d34..30862753e52 100644
--- a/test/elixir/test/reshard_changes_feed.exs
+++ b/test/elixir/test/reshard_changes_feed.exs
@@ -6,6 +6,7 @@ defmodule ReshardChangesFeedTest do
   Test _changes interaction with resharding
   """
 
+  @moduletag :reshard_changes_feed
   @moduletag kind: :cluster
 
   setup do
diff --git a/test/elixir/test/update_documents_test.exs b/test/elixir/test/update_documents_test.exs
index fcbdbeaca89..bd5e0f1ccb5 100644
--- a/test/elixir/test/update_documents_test.exs
+++ b/test/elixir/test/update_documents_test.exs
@@ -1,6 +1,7 @@
 defmodule UpdateDocumentsTest do
   use CouchTestCase
 
+  @moduletag :docs
   @moduletag kind: :single_node
 
   @ddoc %{
diff --git a/test/elixir/test/view_collation_raw_test.exs b/test/elixir/test/view_collation_raw_test.exs
index 1bcd397d98a..b9c40f6d88b 100644
--- a/test/elixir/test/view_collation_raw_test.exs
+++ b/test/elixir/test/view_collation_raw_test.exs
@@ -6,6 +6,7 @@ defmodule ViewCollationRawTest do
   This is a port of the view_collation_raw.js suite
   """
 
+  @moduletag :view_collation_raw
   @moduletag kind: :single_node
 
   @values [
diff --git a/test/elixir/test/view_collation_test.exs b/test/elixir/test/view_collation_test.exs
index 1e3fec03f2f..984d41234f8 100644
--- a/test/elixir/test/view_collation_test.exs
+++ b/test/elixir/test/view_collation_test.exs
@@ -6,6 +6,7 @@ defmodule ViewCollationTest do
   This is a port of the view_collation.js suite
   """
 
+  @moduletag :view_collation
   @moduletag kind: :single_node
 
   @values [
diff --git a/test/elixir/test/view_compaction_test.exs b/test/elixir/test/view_compaction_test.exs
index 5bdd2eac1ea..f827e823481 100644
--- a/test/elixir/test/view_compaction_test.exs
+++ b/test/elixir/test/view_compaction_test.exs
@@ -6,8 +6,9 @@ defmodule ViewCompactionTest do
   This is a port of the view_compaction.js suite
   """
   
+  @moduletag :view_compaction
   @moduletag kind: :single_node
-  
+
   @num_docs 1000
 
   @ddoc %{
diff --git a/test/elixir/test/view_conflicts_test.exs b/test/elixir/test/view_conflicts_test.exs
index 9261b1ef075..89d9cb4eb23 100644
--- a/test/elixir/test/view_conflicts_test.exs
+++ b/test/elixir/test/view_conflicts_test.exs
@@ -1,6 +1,7 @@
 defmodule ViewConflictsTest do
   use CouchTestCase
 
+  @moduletag :view_conflicts
   @moduletag kind: :single_node
 
   setup_all do
diff --git a/test/elixir/test/view_errors_test.exs b/test/elixir/test/view_errors_test.exs
index 80067ec6c4c..1e8f880a654 100644
--- a/test/elixir/test/view_errors_test.exs
+++ b/test/elixir/test/view_errors_test.exs
@@ -1,6 +1,7 @@
 defmodule ViewErrorsTest do
   use CouchTestCase
 
+  @moduletag :view_errors
   @moduletag kind: :single_node
 
   @document %{integer: 1, string: "1", array: [1, 2, 3]}
diff --git a/test/elixir/test/view_include_docs_test.exs b/test/elixir/test/view_include_docs_test.exs
index a7775305840..1c2ab57315b 100644
--- a/test/elixir/test/view_include_docs_test.exs
+++ b/test/elixir/test/view_include_docs_test.exs
@@ -1,6 +1,7 @@
 defmodule ViewIncludeDocsTest do
   use CouchTestCase
 
+  @moduletag :view_include_docs
   @moduletag kind: :single_node
 
   @ddoc %{
diff --git a/test/elixir/test/view_multi_key_all_docs_test.exs b/test/elixir/test/view_multi_key_all_docs_test.exs
index 6426eb2c2e6..c983905805f 100644
--- a/test/elixir/test/view_multi_key_all_docs_test.exs
+++ b/test/elixir/test/view_multi_key_all_docs_test.exs
@@ -1,6 +1,7 @@
 defmodule ViewMultiKeyAllDocsTest do
   use CouchTestCase
 
+  @moduletag :view_multi_key_all_docs
   @moduletag kind: :single_node
 
   @keys ["10", "15", "30", "37", "50"]
diff --git a/test/elixir/test/view_multi_key_design_test.exs b/test/elixir/test/view_multi_key_design_test.exs
index 1ea3fe33431..03cdc574d45 100644
--- a/test/elixir/test/view_multi_key_design_test.exs
+++ b/test/elixir/test/view_multi_key_design_test.exs
@@ -1,6 +1,7 @@
 defmodule ViewMultiKeyDesignTest do
   use CouchTestCase
   
+  @moduletag :view_multi_key_design
   @moduletag kind: :single_node
 
   @keys [10, 15, 30, 37, 50]
diff --git a/test/elixir/test/view_sandboxing_test.exs b/test/elixir/test/view_sandboxing_test.exs
index 99a9c0de422..02087ac60eb 100644
--- a/test/elixir/test/view_sandboxing_test.exs
+++ b/test/elixir/test/view_sandboxing_test.exs
@@ -1,6 +1,7 @@
 defmodule ViewSandboxingTest do
   use CouchTestCase
 
+  @moduletag :view_sandboxing
   @moduletag kind: :single_node
 
   @document %{integer: 1, string: "1", array: [1, 2, 3]}