diff --git a/pytest.ini b/pytest.ini
index d302e2eafa0d..6aa9343fedb9 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,4 @@
 [pytest]
-addopts = -m "dev and not fluent_231"
 markers =
     integration:Short-running tests which read a simple input file and check the exposure and values of various setting objects
     quick:Run the quick tests
diff --git a/tests/test_solvermode/test_controls.py b/tests/test_solvermode/test_controls.py
index 892caadb37b5..cba298c1ad84 100644
--- a/tests/test_solvermode/test_controls.py
+++ b/tests/test_solvermode/test_controls.py
@@ -1,9 +1,9 @@
 import pytest
 
 
-@pytest.mark.integration
 @pytest.mark.quick
 @pytest.mark.setup
+@pytest.mark.fluent_231
 def test_controls(load_mixing_elbow_mesh):
     solver = load_mixing_elbow_mesh
     solver.setup.models.multiphase.models = "vof"
diff --git a/tests/test_solvermode/test_general.py b/tests/test_solvermode/test_general.py
index c47f4b8cb237..f705576f4553 100644
--- a/tests/test_solvermode/test_general.py
+++ b/tests/test_solvermode/test_general.py
@@ -3,6 +3,7 @@
 
 @pytest.mark.quick
 @pytest.mark.setup
+@pytest.mark.fluent_231
 def test_solver_import_mixingelbow(load_mixing_elbow_mesh):
     solver_session = load_mixing_elbow_mesh
     assert solver_session._root.get_attr("active?")
@@ -44,6 +45,7 @@ def test_solver_import_mixingelbow(load_mixing_elbow_mesh):
 
 @pytest.mark.quick
 @pytest.mark.setup
+@pytest.mark.fluent_231
 def test_disk_2d_setup(load_disk_mesh):
     session = load_disk_mesh
     assert session._root.get_attr("active?")
diff --git a/tests/test_solvermode/test_initialization.py b/tests/test_solvermode/test_initialization.py
index 6b0fc51c7a27..91c04372c511 100644
--- a/tests/test_solvermode/test_initialization.py
+++ b/tests/test_solvermode/test_initialization.py
@@ -4,6 +4,7 @@
 
 @pytest.mark.quick
 @pytest.mark.setup
+@pytest.mark.fluent_231
 def test_initialize(launch_fluent_solver_3ddp_t2):
     solver = launch_fluent_solver_3ddp_t2
     input_type, input_name = download_input_file("pyfluent/wigley_hull", "wigley.msh")
@@ -56,6 +57,7 @@ def test_initialize(launch_fluent_solver_3ddp_t2):
 
 @pytest.mark.quick
 @pytest.mark.setup
+@pytest.mark.fluent_231
 def test_fmg_initialize(launch_fluent_solver_3ddp_t2):
     solver = launch_fluent_solver_3ddp_t2
     input_type, input_name = download_input_file(
diff --git a/tests/test_solvermode/test_materials.py b/tests/test_solvermode/test_materials.py
index 55d83df96659..2aa4f7da4ef3 100644
--- a/tests/test_solvermode/test_materials.py
+++ b/tests/test_solvermode/test_materials.py
@@ -2,9 +2,9 @@
 from util.solver import copy_database_material
 
 
-@pytest.mark.integration
 @pytest.mark.quick
 @pytest.mark.setup
+@pytest.mark.fluent_231
 def test_solver_material(load_mixing_elbow_mesh):
     solver_session = load_mixing_elbow_mesh
     copy_database_material(
diff --git a/tests/test_solvermode/test_methods.py b/tests/test_solvermode/test_methods.py
index f89bee4174e0..52095472a77b 100644
--- a/tests/test_solvermode/test_methods.py
+++ b/tests/test_solvermode/test_methods.py
@@ -3,6 +3,7 @@
 
 @pytest.mark.quick
 @pytest.mark.setup
+@pytest.mark.fluent_231
 def test_methods(load_mixing_elbow_mesh):
     solver = load_mixing_elbow_mesh
     solver.setup.models.multiphase.models = "vof"
diff --git a/tests/test_solvermode/test_models.py b/tests/test_solvermode/test_models.py
index 83ae7d062dd0..78a0dac5f2a4 100644
--- a/tests/test_solvermode/test_models.py
+++ b/tests/test_solvermode/test_models.py
@@ -4,6 +4,7 @@
 @pytest.mark.integration
 @pytest.mark.quick
 @pytest.mark.setup
+@pytest.mark.fluent_231
 def test_solver_models(load_mixing_elbow_mesh):
     solver_session = load_mixing_elbow_mesh
     assert not solver_session.setup.models.energy.enabled()
@@ -24,6 +25,7 @@ def test_solver_models(load_mixing_elbow_mesh):
 
 @pytest.mark.quick
 @pytest.mark.setup
+@pytest.mark.fluent_231
 def test_disk_2d_models(load_disk_mesh):
     solver_session = load_disk_mesh
     solver_session.setup.general.solver.two_dim_space = "axisymmetric"
diff --git a/tests/test_solvermode/test_named_expressions.py b/tests/test_solvermode/test_named_expressions.py
index a06144f36805..30d267335918 100644
--- a/tests/test_solvermode/test_named_expressions.py
+++ b/tests/test_solvermode/test_named_expressions.py
@@ -3,6 +3,7 @@
 
 @pytest.mark.quick
 @pytest.mark.setup
+@pytest.mark.fluent_231
 def test_expression(load_mixing_elbow_mesh):
     solver_session = load_mixing_elbow_mesh
     solver_session.setup.models.energy.enabled = True