diff --git a/couchpotato/cli.py b/couchpotato/cli.py
index a9b20705..d3ec00be 100644
--- a/couchpotato/cli.py
+++ b/couchpotato/cli.py
@@ -4,23 +4,25 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.settings import settings
 from libs.daemon import createDaemon
 from logging import handlers
-from optparse import OptionParser
+import argparse
 import logging
 import os.path
 import sys
 
 
-def cmd_couchpotato(base_path):
+def cmd_couchpotato(base_path, argv = None):
     '''Commandline entry point.'''
 
     # Options
-    parser = OptionParser('usage: %prog [options]')
-    parser.add_option('-s', '--datadir', dest = 'data_dir', default = base_path, help = 'Absolute or ~/ path, where settings/logs/database data is saved (default ./)')
-    parser.add_option('-t', '--test', '--debug', action = 'store_true', dest = 'debug', help = 'Debug mode')
-    parser.add_option('-q', '--quiet', action = 'store_true', dest = 'quiet', help = "Don't log to console")
-    parser.add_option('-d', '--daemon', action = 'store_true', dest = 'daemonize', help = 'Daemonize the app')
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-s', '--datadir', dest = 'data_dir', default = base_path, help = 'Absolute or ~/ path, where settings/logs/database data is saved (default ./)')
+    parser.add_argument('-t', '--test', '--debug', action = 'store_true', dest = 'debug', help = 'Debug mode')
+    parser.add_argument('-q', '--quiet', action = 'store_true', dest = 'quiet', help = "Don't log to console")
+    parser.add_argument('-d', '--daemon', action = 'store_true', dest = 'daemonize', help = 'Daemonize the app')
+
+    args = argv if argv else sys.argv[1:]
+    options = parser.parse_args(args)
 
-    (options, args) = parser.parse_args(sys.argv[1:])
 
     # Create data dir if needed
     if not os.path.isdir(options.data_dir):