diff --git a/test/stokes/stokes_3d_dg_quadrilateral.mini b/test/stokes/stokes_3d_dg_quadrilateral.mini
index caeed8bc551b11582ef822868567603aa87fa4ab..d7c82422aab9a3f4522d9ba28c41514da2345f8f 100644
--- a/test/stokes/stokes_3d_dg_quadrilateral.mini
+++ b/test/stokes/stokes_3d_dg_quadrilateral.mini
@@ -11,4 +11,4 @@ extension = vtu
 
 [formcompiler]
 numerical_jacobian = 0, 1 | expand num
-compare_l2errorsquared = 2e-8
\ No newline at end of file
+compare_l2errorsquared = 6e-8
\ No newline at end of file
diff --git a/test/stokes/stokes_3d_dg_quadrilateral.ufl b/test/stokes/stokes_3d_dg_quadrilateral.ufl
index 769bd611078b9441e9aa4b1897c876d08882cbcd..84d1003e16d7f4f36dc0630434d98eb3d633cd3a 100644
--- a/test/stokes/stokes_3d_dg_quadrilateral.ufl
+++ b/test/stokes/stokes_3d_dg_quadrilateral.ufl
@@ -16,21 +16,21 @@ ds = ds(subdomain_id=1, subdomain_data=bctype)
 n = FacetNormal(cell)('+')
 eps = -1.0
 sigma = 1.0
+h_e = Min(CellVolume(cell)('+'), CellVolume(cell)('-')) / FacetArea(cell)
 
 r = inner(grad(u), grad(v))*dx \
   - p*div(v)*dx \
   - q*div(u)*dx \
   + inner(avg(grad(u))*n, jump(v))*dS \
-  + sigma * inner(jump(u), jump(v))*dS \
+  + sigma / h_e * inner(jump(u), jump(v))*dS \
   - eps * inner(avg(grad(v))*n, jump(u))*dS \
   - avg(p)*inner(jump(v), n)*dS \
   - avg(q)*inner(jump(u), n)*dS \
   - inner(grad(u)*n, v)*ds \
-  + p*inner(v, n)*ds \
-  + q*inner(u, n)*ds \
+  + sigma / h_e * inner(u-g_v, v)*ds \
   + eps * inner(grad(v)*n, u-g_v)*ds \
-  + sigma * inner(u-g_v, v)*ds \
-  - q*inner(g_v, n)*ds
+  + p*inner(v, n)*ds \
+  + q*inner(u-g_v, n)*ds
 
 forms = [r]
 exact_solution = g_v, 8.*(1.-x[0])
diff --git a/test/stokes/stokes_dg.mini b/test/stokes/stokes_dg.mini
index 9d65b4a9cf752c2f23d0f6700df1f2b34d393fa5..7744fa4de269d53a39719cdc9ba0bfe2b65f3099 100644
--- a/test/stokes/stokes_dg.mini
+++ b/test/stokes/stokes_dg.mini
@@ -16,4 +16,4 @@ zeroThreshold.data_1 = 1e-6
 
 [formcompiler]
 numerical_jacobian = 0, 1 | expand num
-compare_l2errorsquared = 1e-8
+compare_l2errorsquared = 1e-10
diff --git a/test/stokes/stokes_dg.ufl b/test/stokes/stokes_dg.ufl
index 74b857426979820ac72001a8c69c612a9f016f8e..e7176b264efaf2bbb20146d5c19cd8d4b72a2c45 100644
--- a/test/stokes/stokes_dg.ufl
+++ b/test/stokes/stokes_dg.ufl
@@ -16,21 +16,21 @@ ds = ds(subdomain_id=1, subdomain_data=bctype)
 n = FacetNormal(cell)('+')
 eps = -1.0
 sigma = 1.0
+h_e = Min(CellVolume(cell)('+'), CellVolume(cell)('-')) / FacetArea(cell)
 
 r = inner(grad(u), grad(v))*dx \
+  - p*div(v)*dx \
+  - q*div(u)*dx \
   + inner(avg(grad(u))*n, jump(v))*dS \
+  + sigma / h_e * inner(jump(u), jump(v))*dS \
   - eps * inner(avg(grad(v))*n, jump(u))*dS \
+  - avg(p)*inner(jump(v), n)*dS \
+  - avg(q)*inner(jump(u), n)*dS \
   - inner(grad(u)*n, v)*ds \
+  + sigma / h_e * inner(u-g_v, v)*ds \
   + eps * inner(grad(v)*n, u-g_v)*ds \
-  + sigma * inner(jump(u), jump(v))*dS \
-  + sigma * inner(u-g_v, v)*ds \
-  - p*div(v)*dx \
-  - avg(p)*inner(jump(v), n)*dS \
   + p*inner(v, n)*ds \
-  - q*div(u)*dx \
-  - avg(q)*inner(jump(u), n)*dS \
-  + q*inner(u, n)*ds \
-  - q*inner(g_v, n)*ds
+  + q*inner(u-g_v, n)*ds
 
 forms = [r]
 exact_solution = g_v, 8*(1.-x[0])
\ No newline at end of file
diff --git a/test/stokes/stokes_dg_quadrilateral.ufl b/test/stokes/stokes_dg_quadrilateral.ufl
index 1beb3356fcd35d9e5ca094745ec34aa55f89621c..8f4415a7a3c30635e9add35faf58336995a820e4 100644
--- a/test/stokes/stokes_dg_quadrilateral.ufl
+++ b/test/stokes/stokes_dg_quadrilateral.ufl
@@ -16,21 +16,21 @@ ds = ds(subdomain_id=1, subdomain_data=bctype)
 n = FacetNormal(cell)('+')
 eps = -1.0
 sigma = 1.0
+h_e = Min(CellVolume(cell)('+'), CellVolume(cell)('-')) / FacetArea(cell)
 
 r = inner(grad(u), grad(v))*dx \
   - p*div(v)*dx \
   - q*div(u)*dx \
   + inner(avg(grad(u))*n, jump(v))*dS \
-  + sigma * inner(jump(u), jump(v))*dS \
+  + sigma / h_e * inner(jump(u), jump(v))*dS \
   - eps * inner(avg(grad(v))*n, jump(u))*dS \
   - avg(p)*inner(jump(v), n)*dS \
   - avg(q)*inner(jump(u), n)*dS \
   - inner(grad(u)*n, v)*ds \
-  + p*inner(v, n)*ds \
-  + q*inner(u, n)*ds \
+  + sigma / h_e * inner(u-g_v, v)*ds \
   + eps * inner(grad(v)*n, u-g_v)*ds \
-  + sigma * inner(u-g_v, v)*ds \
-  - q*inner(g_v, n)*ds
+  + p*inner(v, n)*ds \
+  + q*inner(u-g_v, n)*ds
 
 forms = [r]
 exact_solution = g_v, 8*(1.-x[0])
diff --git a/test/sumfact/stokes/stokes_3d_dg.ufl b/test/sumfact/stokes/stokes_3d_dg.ufl
index 769bd611078b9441e9aa4b1897c876d08882cbcd..84d1003e16d7f4f36dc0630434d98eb3d633cd3a 100644
--- a/test/sumfact/stokes/stokes_3d_dg.ufl
+++ b/test/sumfact/stokes/stokes_3d_dg.ufl
@@ -16,21 +16,21 @@ ds = ds(subdomain_id=1, subdomain_data=bctype)
 n = FacetNormal(cell)('+')
 eps = -1.0
 sigma = 1.0
+h_e = Min(CellVolume(cell)('+'), CellVolume(cell)('-')) / FacetArea(cell)
 
 r = inner(grad(u), grad(v))*dx \
   - p*div(v)*dx \
   - q*div(u)*dx \
   + inner(avg(grad(u))*n, jump(v))*dS \
-  + sigma * inner(jump(u), jump(v))*dS \
+  + sigma / h_e * inner(jump(u), jump(v))*dS \
   - eps * inner(avg(grad(v))*n, jump(u))*dS \
   - avg(p)*inner(jump(v), n)*dS \
   - avg(q)*inner(jump(u), n)*dS \
   - inner(grad(u)*n, v)*ds \
-  + p*inner(v, n)*ds \
-  + q*inner(u, n)*ds \
+  + sigma / h_e * inner(u-g_v, v)*ds \
   + eps * inner(grad(v)*n, u-g_v)*ds \
-  + sigma * inner(u-g_v, v)*ds \
-  - q*inner(g_v, n)*ds
+  + p*inner(v, n)*ds \
+  + q*inner(u-g_v, n)*ds
 
 forms = [r]
 exact_solution = g_v, 8.*(1.-x[0])
diff --git a/test/sumfact/stokes/stokes_dg.ufl b/test/sumfact/stokes/stokes_dg.ufl
index d961446a03aa4423c260e28923b8a453e6c7537f..39c243a00c7b16c857f551813b6bf0f4a99ad065 100644
--- a/test/sumfact/stokes/stokes_dg.ufl
+++ b/test/sumfact/stokes/stokes_dg.ufl
@@ -16,21 +16,21 @@ ds = ds(subdomain_id=1, subdomain_data=bctype)
 n = FacetNormal(cell)('+')
 eps = -1.0
 sigma = 1.0
+h_e = Min(CellVolume(cell)('+'), CellVolume(cell)('-')) / FacetArea(cell)
 
 r = inner(grad(u), grad(v))*dx \
   - p*div(v)*dx \
   - q*div(u)*dx \
   + inner(avg(grad(u))*n, jump(v))*dS \
-  + sigma * inner(jump(u), jump(v))*dS \
+  + sigma / h_e * inner(jump(u), jump(v))*dS \
   - eps * inner(avg(grad(v))*n, jump(u))*dS \
   - avg(p)*inner(jump(v), n)*dS \
   - avg(q)*inner(jump(u), n)*dS \
   - inner(grad(u)*n, v)*ds \
-  + p*inner(v, n)*ds \
-  + q*inner(u, n)*ds \
+  + sigma / h_e * inner(u-g_v, v)*ds \
   + eps * inner(grad(v)*n, u-g_v)*ds \
-  + sigma * inner(u-g_v, v)*ds \
-  - q*inner(g_v, n)*ds
+  + p*inner(v, n)*ds \
+  + q*inner(u-g_v, n)*ds
 
 forms = [r]
 exact_solution = g_v, 8*(1.-x[0])
\ No newline at end of file