diff --git a/MAC/Deployment/data/Coordinates/db_test.py b/MAC/Deployment/data/Coordinates/db_test.py
index 2ba3f0f369953df9dcb0c5d69c840894f39e2b9c..4e1e9c48465a80377d8768dd9b749c2574955808 100755
--- a/MAC/Deployment/data/Coordinates/db_test.py
+++ b/MAC/Deployment/data/Coordinates/db_test.py
@@ -1,18 +1,52 @@
 #!/usr/bin/env python
-#coding: iso-8859-15
-import re,sys,pgdb,pg
-import database
+# coding: iso-8859-15
+import pg
+import getpass
+from optparse import OptionParser
 
-aDataBase = database.getDBname()
-aHost = database.getDBhost()
 
 #
 # MAIN
 #
 if __name__ == '__main__':
+    parser = OptionParser("Usage: %prog [options]")
 
-    db = pg.DB(user="postgres", host=aHost, dbname=aDataBase)
-    print db.query("select * from reference_coord")
-    db.close()
+    parser.add_option("-D", "--database",
+                      dest="dbName",
+                      type="string",
+                      default="StationCoordinates",
+                      help="Name of StationCoordinates database to use")
+
+    parser.add_option("-H", "--host",
+                      dest="dbHost",
+                      type="string",
+                      default="sasdb.control.lofar",
+                      help="Hostname of StationCoordinates database")
+
+    parser.add_option("-P", "--port",
+                      dest="dbPort",
+                      type="int",
+                      default="5432",
+                      help="Port of StationCoordinates database")
+
+    parser.add_option("-U", "--user",
+                      dest="dbUser",
+                      type="string",
+                      default="postgres",
+                      help="Username of StationCoordinates database")
+
+    # parse arguments
 
+    (options, args) = parser.parse_args()
 
+    dbName = options.dbName
+    dbHost = options.dbHost
+    dbPort = options.dbPort
+    dbUser = options.dbUser
+
+    dbPassword = getpass.getpass()
+
+    db = pg.connect(user=dbUser, host=dbHost, dbname=dbName, port=dbPort, passwd=dbPassword)
+
+    print db.query("select * from reference_coord")
+    db.close()