diff --git a/jjb/pipeline/voltha/playground/voltha-tt-physical-functional-tests.groovy b/jjb/pipeline/voltha/playground/voltha-tt-physical-functional-tests.groovy
index 7e8b5d9..569cf1d 100644
--- a/jjb/pipeline/voltha/playground/voltha-tt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/playground/voltha-tt-physical-functional-tests.groovy
@@ -69,19 +69,12 @@
 
 	// -----------------------------------------------------------------------
 	// -----------------------------------------------------------------------
-	stage('IAM')
-	{
-	    String iam = getIam('main')
-            println("** ${iam}: ENTER")
-            println("** ${iam}: LEAVE")
-	}
-
-	// -----------------------------------------------------------------------
-	// -----------------------------------------------------------------------
 	stage('Clone voltha-system-tests')
 	{
 	    steps
 	    {
+		iam(this) { enter = true }
+
 		step([$class: 'WsCleanup'])
 		checkout([
 		    $class: 'GitSCM',
@@ -110,6 +103,8 @@
               exit 1  # verify fail
             fi
             """)
+
+		iam(this) { leave = true }
 		} // step
 	    } // steps
 	} // stage