diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9ffa62a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,62 @@
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+*.pyc
+build/
+dist/
+doc/build/
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+.idea
+.tox
+*.sublime*
+*.egg-info
+Icon?
+ehthumbs.db
+Thumbs.db
+.eggs
+
+# User driven backup files #
+############################
+*.bak
+
+# Generated by pbr while building docs
+######################################
+AUTHORS
+ChangeLog
+
+# Files created by releasenotes build
+releasenotes/build
+
+# Test temp files
+tests/plugins
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..35dd68f
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=openstack/openstack-ansible-memcached_server.git
diff --git a/tests/ansible.cfg b/tests/ansible.cfg
index 8a26695..7ce9293 100644
--- a/tests/ansible.cfg
+++ b/tests/ansible.cfg
@@ -1,3 +1,6 @@
 [defaults]
 roles_path = ../../
 remote_tmp = ../.ansible/tmp/
+
+host_key_checking = False
+control_path = %(directory)s/%%h-%%r
diff --git a/tests/test.yml b/tests/test.yml
index b10853c..596dd27 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -37,7 +37,6 @@
         that:
           - "memcached_log.stat.exists"
           - "'logfile /var/log/memcached.log' in memcached_file_content"
-          - "'-m 3758' in memcached_file_content"
           - "'-l 127.0.0.1' in memcached_file_content"
           - "'-c 1024' in memcached_file_content"
           - "'-t 4' in memcached_file_content"