diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
index 853907b5ef8..93269d5f6be 100644
--- a/Examples/CMakeLists.txt
+++ b/Examples/CMakeLists.txt
@@ -94,6 +94,36 @@ endfunction()
 # Add tests (alphabetical order) ##############################################
 #
 
+# averaged_galilean_2d_psatd ##################################################
+#
+if(WarpX_FFT)
+    add_warpx_test(
+        averaged_galilean_2d_psatd # name
+        2  # dims
+        ON # mpi
+        1  # mpi_np
+        Examples/Tests/nci_psatd_stability/inputs_avg_2d_base # inputs_base
+        Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd # inputs_test
+        Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis
+        diags/diag1000400 # output
+    )
+endif()
+
+# averaged_galilean_2d_psatd_hybrid ###########################################
+#
+if(WarpX_FFT)
+    add_warpx_test(
+        averaged_galilean_2d_psatd_hybrid # name
+        2  # dims
+        ON # mpi
+        2  # mpi_np
+        Examples/Tests/nci_psatd_stability/inputs_avg_2d_base # inputs_base
+        Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid # inputs_test
+        Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis
+        diags/diag1000400 # output
+    )
+endif()
+
 # Langmuir_multi_2d_MR ########################################################
 #
 add_warpx_test(
@@ -235,3 +265,79 @@ if(WarpX_FFT)
         diags/diag1000080 # output
     )
 endif()
+
+# Langmuir_multi_2d_psatd_multiJ_nodal ########################################
+#
+if(WarpX_FFT)
+    add_warpx_test(
+        Langmuir_multi_2d_psatd_multiJ_nodal # name
+        2  # dims
+        ON # mpi
+        2  # mpi_np
+        Examples/Tests/langmuir/inputs_2d_base # inputs_base
+        Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal # inputs_test
+        Examples/Tests/langmuir/analysis_2d.py # analysis
+        diags/diag1000080 # output
+    )
+endif()
+
+# Langmuir_multi_2d_psatd_nodal ###############################################
+#
+if(WarpX_FFT)
+    add_warpx_test(
+        Langmuir_multi_2d_psatd_nodal # name
+        2  # dims
+        ON # mpi
+        2  # mpi_np
+        Examples/Tests/langmuir/inputs_2d_base # inputs_base
+        Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal # inputs_test
+        Examples/Tests/langmuir/analysis_2d.py # analysis
+        diags/diag1000080 # output
+    )
+endif()
+
+# Langmuir_multi_2d_psatd_Vay_deposition ######################################
+#
+if(WarpX_FFT)
+    add_warpx_test(
+        Langmuir_multi_2d_psatd_Vay_deposition # name
+        2  # dims
+        ON # mpi
+        1  # mpi_np
+        Examples/Tests/langmuir/inputs_2d_base # inputs_base
+        Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition # inputs_test
+        Examples/Tests/langmuir/analysis_2d.py # analysis
+        diags/diag1000080 # output
+    )
+endif()
+
+# Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 #####################
+#
+# FIXME
+#if(WarpX_FFT)
+#    add_warpx_test(
+#        Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # name
+#        2  # dims
+#        ON # mpi
+#        1  # mpi_np
+#        Examples/Tests/langmuir/inputs_2d_base # inputs_base
+#        Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # inputs_test
+#        Examples/Tests/langmuir/analysis_2d.py # analysis
+#        diags/diag1000080 # output
+#    )
+#endif()
+
+# Langmuir_multi_2d_psatd_Vay_deposition_nodal ################################
+#
+if(WarpX_FFT)
+    add_warpx_test(
+        Langmuir_multi_2d_psatd_Vay_deposition_nodal # name
+        2  # dims
+        ON # mpi
+        1  # mpi_np
+        Examples/Tests/langmuir/inputs_2d_base # inputs_base
+        Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal # inputs_test
+        Examples/Tests/langmuir/analysis_2d.py # analysis
+        diags/diag1000080 # output
+    )
+endif()
diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition
new file mode 100644
index 00000000000..1c40777711a
--- /dev/null
+++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition
@@ -0,0 +1,8 @@
+# additional runtime parameters
+algo.current_deposition = vay
+algo.maxwell_solver = psatd
+amr.max_grid_size = 128
+diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE
+diag1.electrons.variables = x z w ux uy uz
+diag1.positrons.variables = x z w ux uy uz
+warpx.cfl = 0.7071067811865475
diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal
new file mode 100644
index 00000000000..a514c1561f0
--- /dev/null
+++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal
@@ -0,0 +1,9 @@
+# additional runtime parameters
+algo.current_deposition = vay
+algo.maxwell_solver = psatd
+amr.max_grid_size = 128
+diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE
+diag1.electrons.variables = x z w ux uy uz
+diag1.positrons.variables = x z w ux uy uz
+warpx.cfl = 0.7071067811865475
+warpx.grid_type = collocated
diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4
new file mode 100644
index 00000000000..3f216a84708
--- /dev/null
+++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4
@@ -0,0 +1,9 @@
+# additional runtime parameters
+algo.current_deposition = vay
+algo.maxwell_solver = psatd
+algo.particle_shape = 4
+amr.max_grid_size = 128
+diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE
+diag1.electrons.variables = x z w ux uy uz
+diag1.positrons.variables = x z w ux uy uz
+warpx.cfl = 0.7071067811865475
diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal
new file mode 100644
index 00000000000..f71c7bebb73
--- /dev/null
+++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal
@@ -0,0 +1,10 @@
+# additional runtime parameters
+algo.maxwell_solver = psatd
+psatd.J_in_time = linear
+psatd.solution_type = first-order
+psatd.update_with_rho = 1
+warpx.abort_on_warning_threshold = medium
+warpx.cfl = 0.7071067811865475
+warpx.do_multi_J = 1
+warpx.do_multi_J_n_depositions = 2
+warpx.grid_type = collocated
diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal
new file mode 100644
index 00000000000..f865571edf7
--- /dev/null
+++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal
@@ -0,0 +1,10 @@
+# additional runtime parameters
+algo.current_deposition = direct
+algo.maxwell_solver = psatd
+diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell
+diag1.electrons.variables = x z w ux uy uz
+diag1.positrons.variables = x z w ux uy uz
+psatd.current_correction = 0
+warpx.abort_on_warning_threshold = medium
+warpx.cfl = 0.7071067811865475
+warpx.grid_type = collocated
diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_2d b/Examples/Tests/nci_psatd_stability/inputs_avg_2d_base
similarity index 100%
rename from Examples/Tests/nci_psatd_stability/inputs_avg_2d
rename to Examples/Tests/nci_psatd_stability/inputs_avg_2d_base
diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd b/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd
new file mode 100644
index 00000000000..c7b32a2cf88
--- /dev/null
+++ b/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd
@@ -0,0 +1,3 @@
+# additional runtime parameters
+psatd.current_correction = 0
+warpx.abort_on_warning_threshold = medium
diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid b/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid
new file mode 100644
index 00000000000..338daed4764
--- /dev/null
+++ b/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid
@@ -0,0 +1,6 @@
+# additional runtime parameters
+amr.max_grid_size_x = 128
+amr.max_grid_size_y = 64
+psatd.current_correction = 0
+warpx.abort_on_warning_threshold = medium
+warpx.grid_type = hybrid
diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini
index 784c9e9bf43..ebce1381242 100644
--- a/Regression/WarpX-tests.ini
+++ b/Regression/WarpX-tests.ini
@@ -71,8 +71,9 @@ cmakeSetupOpts = -DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON -DWarpX_PYTHON_IPO=OFF
 
 [averaged_galilean_2d_psatd]
 buildDir = .
-inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d
-runtime_params = psatd.current_correction=0 warpx.abort_on_warning_threshold=medium
+inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d_base
+aux1File = Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd
+runtime_params = FILE=inputs_avg_2d_test_averaged_galilean_2d_psatd
 dim = 2
 addToCompileString = USE_FFT=TRUE
 cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON
@@ -85,8 +86,9 @@ analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py
 
 [averaged_galilean_2d_psatd_hybrid]
 buildDir = .
-inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d
-runtime_params = amr.max_grid_size_x=128 amr.max_grid_size_y=64 warpx.grid_type=hybrid psatd.current_correction=0 warpx.abort_on_warning_threshold=medium
+inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d_base
+aux1File = Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid
+runtime_params = FILE=inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid
 dim = 2
 addToCompileString = USE_FFT=TRUE
 cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON
@@ -1172,7 +1174,8 @@ analysisOutputImage = Langmuir_multi_2d_psatd_multiJ.png
 [Langmuir_multi_2d_psatd_multiJ_nodal]
 buildDir = .
 inputFile = Examples/Tests/langmuir/inputs_2d_base
-runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium warpx.grid_type=collocated
+aux1File  = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal
+runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal
 dim = 2
 addToCompileString = USE_FFT=TRUE
 cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON
@@ -1187,7 +1190,8 @@ analysisOutputImage = Langmuir_multi_2d_psatd_multiJ_nodal.png
 [Langmuir_multi_2d_psatd_nodal]
 buildDir = .
 inputFile = Examples/Tests/langmuir/inputs_2d_base
-runtime_params = algo.maxwell_solver=psatd warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium
+aux1File  = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal
+runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_nodal
 dim = 2
 addToCompileString = USE_FFT=TRUE
 cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON
@@ -1202,7 +1206,8 @@ analysisOutputImage = langmuir_multi_2d_analysis.png
 [Langmuir_multi_2d_psatd_Vay_deposition]
 buildDir = .
 inputFile = Examples/Tests/langmuir/inputs_2d_base
-runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475
+aux1File  = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition
+runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition
 dim = 2
 addToCompileString = USE_FFT=TRUE
 cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON
@@ -1217,7 +1222,8 @@ analysisOutputImage = langmuir_multi_2d_analysis.png
 [Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4]
 buildDir = .
 inputFile = Examples/Tests/langmuir/inputs_2d_base
-runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 algo.particle_shape=4
+aux1File  = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4
+runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4
 dim = 2
 addToCompileString = USE_FFT=TRUE
 cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON
@@ -1232,7 +1238,8 @@ analysisOutputImage = langmuir_multi_2d_analysis.png
 [Langmuir_multi_2d_psatd_Vay_deposition_nodal]
 buildDir = .
 inputFile = Examples/Tests/langmuir/inputs_2d_base
-runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 warpx.grid_type=collocated algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475
+aux1File  = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal
+runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal
 dim = 2
 addToCompileString = USE_FFT=TRUE
 cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON