diff --git a/applications/test/surfaceMeshConvert/Make/files b/applications/test/surfaceMeshConvert/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..91a99b3fefff01fee84d55894c34e5996b9d2a38
--- /dev/null
+++ b/applications/test/surfaceMeshConvert/Make/files
@@ -0,0 +1,3 @@
+Test-surfaceMeshConvert.C
+
+EXE = $(FOAM_APPBIN)/Test-surfaceMeshConvert
diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/Make/options b/applications/test/surfaceMeshConvert/Make/options
similarity index 100%
rename from applications/utilities/surface/surfaceMeshConvertTesting/Make/options
rename to applications/test/surfaceMeshConvert/Make/options
diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C b/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
similarity index 98%
rename from applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
rename to applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
index 2db1c32b11457dd3669765b41523b879f8e424c5..39cc729ba3a8b203ae62e9c26c84aa84202c1f17 100644
--- a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
+++ b/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
@@ -22,17 +22,16 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    surfaceMeshConvertTesting
+    Test-surfaceMeshConvert
 
 Group
     grpSurfaceUtilities
 
 Description
-    Converts from one surface mesh format to another, but primarily
-    used for testing functionality.
+    Test conversions from one surface mesh format to another.
 
 Usage
-    \b surfaceMeshConvertTesting inputFile outputFile [OPTION]
+    \b Test-surfaceMeshConvert inputFile outputFile [OPTION]
 
     Options:
       - \par -clean
diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/Make/files b/applications/utilities/surface/surfaceMeshConvertTesting/Make/files
deleted file mode 100644
index 6fd163a0548ac9993f75cf0336b7e00d8080913a..0000000000000000000000000000000000000000
--- a/applications/utilities/surface/surfaceMeshConvertTesting/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-surfaceMeshConvertTesting.C
-
-EXE = $(FOAM_APPBIN)/surfaceMeshConvertTesting
diff --git a/etc/config.sh/completion_cache b/etc/config.sh/completion_cache
index 942dbe4e466966b337c7d37a8f8068bacdcddef1..0456a7e8249caab6c6f6266ca4ba2eab1ed5ac2f 100644
--- a/etc/config.sh/completion_cache
+++ b/etc/config.sh/completion_cache
@@ -224,7 +224,6 @@ _of_complete_cache_[surfaceInertia]="-case -density -referencePoint | -noFunctio
 _of_complete_cache_[surfaceInflate]="-case -featureAngle -nSmooth | -checkSelfIntersection -debug -noFunctionObjects -srcDoc -doc -help"
 _of_complete_cache_[surfaceLambdaMuSmooth]="-featureFile | -srcDoc -doc -help"
 _of_complete_cache_[surfaceMeshConvert]="-case -dict -from -scaleIn -scaleOut -to | -clean -noFunctionObjects -tri -srcDoc -doc -help"
-_of_complete_cache_[surfaceMeshConvertTesting]="-case -scale | -clean -noFunctionObjects -orient -stdout -surfMesh -testModify -triFace -triSurface -unsorted -srcDoc -doc -help"
 _of_complete_cache_[surfaceMeshExport]="-case -dict -from -name -scaleIn -scaleOut -to | -clean -noFunctionObjects -srcDoc -doc -help"
 _of_complete_cache_[surfaceMeshImport]="-case -dict -from -name -scaleIn -scaleOut -to | -clean -noFunctionObjects -srcDoc -doc -help"
 _of_complete_cache_[surfaceMeshInfo]="-case -scale | -areas -noFunctionObjects -xml -srcDoc -doc -help"