diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk
index 93c77b2a9e4..148d6adb842 100644
--- a/mps/code/comm.gmk
+++ b/mps/code/comm.gmk
@@ -271,7 +271,7 @@ endif
 
 all: mpmss sacss amcss amcsshe amsss amssshe segsmss awlut awluthe \
      mpsicv lockcov poolncv locv qs apss \
-     finalcv finaltest arenacv bttest teletest \
+     finalcv fint1658 finaltest arenacv bttest teletest \
      abqtest cbstest btcv mv2test messtest steptest \
      eventcnv walkt0 libcbt \
      mps.a mpsplan.a
@@ -296,7 +296,7 @@ testrun: mpmss apss sacss amcss amcsshe amsss amssshe segsmss awlut awluthe \
 
 mpmss sacss amcss amcssth amcsshe amsss amssshe segsmss awlut awlutth \
   awluthe mpsicv lockcov poolncv locv qs apss \
-  finalcv finaltest arenacv bttest teletest \
+  finalcv fint1658 finaltest arenacv bttest teletest \
   expt825 \
   libcbt \
   abqtest cbstest btcv mv2test \
@@ -357,6 +357,9 @@ ifdef VARIETY
 $(PFM)/$(VARIETY)/finalcv: $(PFM)/$(VARIETY)/finalcv.o \
 	$(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(TESTLIBOBJ)
 
+$(PFM)/$(VARIETY)/fint1658: $(PFM)/$(VARIETY)/fint1658.o \
+	$(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(TESTLIBOBJ)
+
 $(PFM)/$(VARIETY)/finaltest: $(PFM)/$(VARIETY)/finaltest.o \
 	$(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(TESTLIBOBJ)
 
diff --git a/mps/code/commpost.nmk b/mps/code/commpost.nmk
index 7ac31eef857..80fbd709b03 100644
--- a/mps/code/commpost.nmk
+++ b/mps/code/commpost.nmk
@@ -16,7 +16,8 @@
 
 all: mpmss.exe amcss.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awluthe.exe\
      mpsicv.exe lockutw3.exe lockcov.exe poolncv.exe locv.exe qs.exe apss.exe \
-     finalcv.exe finaltest.exe arenacv.exe bttest.exe teletest.exe \
+     finalcv.exe fint1658.exe finaltest.exe \
+     arenacv.exe bttest.exe teletest.exe \
      abqtest.exe cbstest.exe btcv.exe mv2test.exe messtest.exe steptest.exe \
      locbwcss.exe locusss.exe \
      eventcnv.exe \
@@ -32,7 +33,8 @@ swall: mmsw.lib replaysw.exe
 
 mpmss.exe amcss.exe amcsshe.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awluthe.exe dwstress.exe \
      mpsicv.exe lockutw3.exe lockcov.exe poolncv.exe locv.exe qs.exe apss.exe \
-     finalcv.exe finaltest.exe arenacv.exe bttest.exe teletest.exe \
+     finalcv.exe fint1658.exe finaltest.exe \
+     arenacv.exe bttest.exe teletest.exe \
      expt825.exe \
      abqtest.exe cbstest.exe btcv.exe mv2test.exe messtest.exe steptest.exe \
      walkt0.exe locbwcss.exe locusss.exe \
@@ -111,6 +113,10 @@ $(PFM)\$(VARIETY)\finalcv.exe: $(PFM)\$(VARIETY)\finalcv.obj \
 	$(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \
 	$(MRGOBJ) $(TESTLIBOBJ)
 
+$(PFM)\$(VARIETY)\fint1658.exe: $(PFM)\$(VARIETY)\fint1658.obj \
+	$(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \
+	$(MRGOBJ) $(TESTLIBOBJ)
+
 $(PFM)\$(VARIETY)\finaltest.exe: $(PFM)\$(VARIETY)\finaltest.obj \
 	$(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \
 	$(MRGOBJ) $(TESTLIBOBJ)
diff --git a/mps/code/fint1658.c b/mps/code/fint1658.c
index cc7af27f9ac..0ef56131fe5 100644
--- a/mps/code/fint1658.c
+++ b/mps/code/fint1658.c
@@ -1,4 +1,4 @@
-/* finalcv.c: FINALIZATION COVERAGE TEST
+/* fint1658.c: Test for suspected defect described in job001658
  *
  * $Id$
  * Copyright (c) 2001 Ravenbrook Limited.  See end of file for license.
@@ -15,7 +15,11 @@
  *
  * NOTES
  *
- * This code was created by first copying <code/weakcv.c>
+ * This code was created by first copying <code/finalcv.c>.
+ *
+ * The modifications are to make lots of guardians, such that they 
+ * don't all fit on one segment, in order to test for the (suspected) 
+ * finalization promptness defect described in job001658.
  */
 
 #include "testlib.h"