diff --git a/CEP/ParmDB/src/parmdbremote-scr b/CEP/ParmDB/src/parmdbremote-scr
index 0c85d680b37e43db7cf27574f753dc2d11c1e171..998397fc6cb50aeae617fe2cfaf6d3f2a8736d44 100755
--- a/CEP/ParmDB/src/parmdbremote-scr
+++ b/CEP/ParmDB/src/parmdbremote-scr
@@ -22,6 +22,7 @@
 #
 # $Id$
 
+
 if test $# != 10; then
   echo "run as:   parmdbremote-src 'socket' host port np rank"
   echo "                           pdb-part filesys ms-part-vds envfile"
@@ -44,3 +45,5 @@ if test -d $wd; then
 fi
 
 parmdbremote $2 $3 $6    # host,port,parmdb-part
+
+rm -f $envfile
diff --git a/CEP/ParmDB/test/Makefile.am b/CEP/ParmDB/test/Makefile.am
index 1dcf5030bc57d1e487cd9f14c9f8dff205074387..c7b1633ad6ec71da0dc14053ca165e8a258d05df 100644
--- a/CEP/ParmDB/test/Makefile.am
+++ b/CEP/ParmDB/test/Makefile.am
@@ -13,7 +13,8 @@ TESTSCRIPTS           = tAxis.sh tAxisMapping.sh tBox.sh tGrid.sh \
 			tParmFacade.sh tParmFacadeDistr.sh \
 			tparmdb.sh \
 			tSourceDBCasa.sh tmakesourcedb.sh \
-			tsetupparmdb.sh tsetupsourcedb.sh
+			tsetupparmdb.sh tsetupsourcedb.sh \
+			tTimeAxis.sh
 
 # scripts and possible programs to run tests
 TESTS	              = $(TESTSCRIPTS)
diff --git a/CEP/ParmDB/test/tTimeAxis.cc b/CEP/ParmDB/test/tTimeAxis.cc
index f2bedeb22d9852f01ea2e38931b3f4ca8ac461d2..5ab7e27ceb7659e5485feaad7c42e1ed737578de 100644
--- a/CEP/ParmDB/test/tTimeAxis.cc
+++ b/CEP/ParmDB/test/tTimeAxis.cc
@@ -82,6 +82,10 @@ void doIt (const string& msname, int timestep, int timestart)
 int main (int argc, char* argv[])
 {
   try {
+    if (argc < 2) {
+      cerr << "Run as:  tTimeAxis MS [timestep [timestsrt]" << endl;
+      return 1;
+    }
     int timestep = 50;
     int timestart = 0;
     if (argc > 2) {