diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index f28a427723..fb5260b2c2 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -2847,11 +2847,8 @@ class OaiCiTest():
 			self.desc = 'Automatic Termination of eNB'
 			HTML.desc='Automatic Termination of eNB'
 			self.ShowTestID()
-			#Terminate all instances on all servers, eNB, eNB1, eNB2
-			#RAN.eNB_instance=0
-			RAN.TerminateeNB(0)
-			RAN.TerminateeNB(1)
-			RAN.TermintateeNB(2)
+			RAN.eNB_instance=0
+			RAN.TerminateeNB()
 		if RAN.flexranCtrlInstalled and RAN.flexranCtrlStarted:
 			self.testCase_id = 'AUTO-KILL-flexran-ctl'
 			HTML.testCase_id=self.testCase_id
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index 927941d029..d5906e9567 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -546,27 +546,25 @@ class RANManagement():
 		except:
 			os.kill(os.getppid(),signal.SIGUSR1)
 
-	def TerminateeNB(self,eNB_serverId):
-		if eNB_serverId == '0':
+	def TerminateeNB(self):
+		if self.eNB_serverId == '0':
 			lIpAddr = self.eNBIPAddress
 			lUserName = self.eNBUserName
 			lPassWord = self.eNBPassword
 			lSourcePath = self.eNBSourceCodePath
-		elif eNB_serverId == '1':
+		elif self.eNB_serverId == '1':
 			lIpAddr = self.eNB1IPAddress
 			lUserName = self.eNB1UserName
 			lPassWord = self.eNB1Password
 			lSourcePath = self.eNB1SourceCodePath
-		elif eNB_serverId == '2':
+		elif self.eNB_serverId == '2':
 			lIpAddr = self.eNB2IPAddress
 			lUserName = self.eNB2UserName
 			lPassWord = self.eNB2Password
 			lSourcePath = self.eNB2SourceCodePath
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
-			#HELP.GenericHelp(CONST.Version)
-			#sys.exit('Insufficient Parameter')
-			logging.debug('ATTENTION Cannot clean eNB_serverID='+eNB_serverID+' '+'@'+lIpAddr+' path:'+lSourcePath+' : No parameters')
-			return
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
 		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)