diff --git a/test/.gitignore b/test/.gitignore
index df1c4422f0eaafdee754347ec4b08bcc6a8a1393..2d5a700ed97659ad1a1bd937cde2fb4aef48f38f 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -8,4 +8,5 @@ ut_*
 *.trs
 
 .dirstamp
+dring-sample.yml
 dring-sample.yml.bak
diff --git a/test/sip/Makefile.am b/test/sip/Makefile.am
index 0a6b33b39cbfd8803b41cc368f14b5ee34cbd8b8..51d94eebf7ae46cfb96dcc7605c439edff91427b 100644
--- a/test/sip/Makefile.am
+++ b/test/sip/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/globals.mk
 AM_CXXFLAGS = -I$(top_srcdir)/src
 AM_LDFLAGS = $(CPPUNIT_LIBS) $(top_builddir)/src/libring.la
 
-check_PROGRAMS = test_sip
-test_sip_SOURCES = sip.cpp test_SIP.h test_SIP.cpp
+check_PROGRAMS = ut_sip
+ut_sip_SOURCES = sip.cpp test_SIP.h test_SIP.cpp
 
 TESTS = $(check_PROGRAMS)
diff --git a/test/sip/dring-sample.yml b/test/sip/dring-sample.yml
deleted file mode 100644
index f5be019855d9a88dbc9740093bc2baae46d1c98f..0000000000000000000000000000000000000000
--- a/test/sip/dring-sample.yml
+++ /dev/null
@@ -1,123 +0,0 @@
-accounts:
-  - id: IP2IP
-    alias: IP2IP
-    enable: true
-    type: SIP
-    allCodecs: 1/2/3/4/5/6/7/8/9/10/11/
-    mailbox: ""
-    autoAnswer: false
-    activeCallLimit: -1
-    ringtoneEnabled: true
-    ringtonePath: /usr/share/ring/ringtones/default.wav
-    hasCustomUserAgent: false
-    useragent: Ring/3.0.0
-    displayName: ""
-    hostname: ""
-    upnpEnabled: false
-    audioPortMax: 32766
-    audioPortMin: 16384
-    dtmfType: overrtp
-    interface: default
-    publishAddr: ""
-    publishPort: 5060
-    sameasLocal: true
-    videoEnabled: true
-    videoPortMax: 65534
-    videoPortMin: 49152
-    stunEnabled: false
-    stunServer: ""
-    turnEnabled: false
-    turnServer: ""
-    turnServerUserName: ""
-    turnServerPassword: ""
-    turnServerRealm: ""
-    port: 5060
-    username: ""
-    credential:
-      - Account.password: ""
-        Account.realm: "*"
-        Account.username: ""
-    keepAlive: false
-    presenceModuleEnabled: false
-    presencePublishSupported: false
-    presenceSubscribeSupported: false
-    registrationexpire: 60
-    serviceRoute: ""
-    tls:
-      calist: ""
-      certificate: ""
-      password: ""
-      privateKey: ""
-      enable: false
-      tlsPort: 5061
-      verifyClient: true
-      verifyServer: false
-      requireCertif: true
-      timeout: 2
-      ciphers: ""
-      method: TLSv1
-      server: ""
-    srtp:
-      keyExchange: ""
-      rtpFallback: false
-preferences:
-  historyLimit: 0
-  historyMaxCalls: 20
-  md5Hash: false
-  order: IP2IP/
-  portNum: 5060
-  registrationexpire: 180
-  searchBarDisplay: true
-  zoneToneChoice: North America
-voipPreferences:
-  playDtmf: true
-  playTones: true
-  pulseLength: 250
-  symmetric: true
-  zidFile: ""
-hooks:
-  numberAddPrefix: ""
-  sipEnabled: false
-  urlCommand: x-www-browser
-  urlSipField: X-ring-url
-audio:
-  alsa:
-    cardIn: 0
-    cardOut: 0
-    cardRing: 0
-    plugin: default
-    smplRate: 44100
-  alwaysRecording: false
-  audioApi: pulseaudio
-  automaticGainControl: false
-  captureMuted: false
-  noiseReduce: false
-  playbackMuted: false
-  pulse:
-    devicePlayback: ""
-    deviceRecord: ""
-    deviceRingtone: ""
-  recordPath: ""
-  volumeMic: 1
-  volumeSpkr: 1
-video:
-  decodingAccelerated: true
-  devices:
-    - framerate: 30
-      channel: Camera 1
-      name: "Integrated Camera: Integrated C"
-      video_size: 960x540
-    - framerate: 30
-      channel: Camera 1
-      video_size: 800x600
-      name: Logitech BRIO
-    - framerate: 30
-      name: Integrated Camera
-      video_size: 960x540
-      channel: Camera 1
-shortcuts:
-  hangUp: ""
-  pickUp: ""
-  popupWindow: ""
-  toggleHold: ""
-  togglePickupHangup: ""
\ No newline at end of file
diff --git a/test/turn/Makefile.am b/test/turn/Makefile.am
index 5f419219d2129fbb1c4098035ca7d7eb23eb143c..19fea982e6332daafabd3e43119397b41dbe53da 100644
--- a/test/turn/Makefile.am
+++ b/test/turn/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/globals.mk
 AM_CXXFLAGS = -I$(top_srcdir)/src
 AM_LDFLAGS = $(CPPUNIT_LIBS) $(top_builddir)/src/libring.la
 
-check_PROGRAMS = test_turn
-test_turn_SOURCES = main.cpp test_turn.h test_TURN.cpp
+check_PROGRAMS = ut_turn
+ut_turn_SOURCES = main.cpp test_turn.h test_TURN.cpp
 
 TESTS = $(check_PROGRAMS)