diff --git a/deploy/aws/emr_genie_launch.sh b/deploy/aws/emr_genie_launch.sh
index 11a08475d58..eead2e699b0 100755
--- a/deploy/aws/emr_genie_launch.sh
+++ b/deploy/aws/emr_genie_launch.sh
@@ -27,7 +27,7 @@ echo "Using EMR Genie bootstrap action from: $EMR_GENIE_BOOTSTRAP_LOC"
  
 # Launching EMR
 elastic-mapreduce --create --alive --instance-type m1.xlarge --instance-count 2  \
-    --ssh --debug --trace --visible-to-all-users --name "Genie Testing" \
+    --ssh --debug --trace --visible-to-all-users --name "Genie Testing" --ami-version "2.4.2" \
     --hive-interactive --hive-versions 0.11.0 --pig-interactive --pig-versions 0.11.1 \
     --bootstrap-action s3://elasticmapreduce/bootstrap-actions/run-if \
     --args "instance.isMaster=true,$EMR_GENIE_BOOTSTRAP_LOC"
\ No newline at end of file
diff --git a/deploy/aws/emr_genie_postinstall.sh b/deploy/aws/emr_genie_postinstall.sh
index 757ad73322f..cace2955f56 100755
--- a/deploy/aws/emr_genie_postinstall.sh
+++ b/deploy/aws/emr_genie_postinstall.sh
@@ -24,16 +24,6 @@
 hadoop fs -chmod -R 777 /
 
 # Register EMR cluster
-cd $HOME/genie/genie-web/src/test/python/utils
 export SERVICE_BASE_URL=http://localhost:7001
+cd $HOME/genie/genie-web/src/test/python/utils
 python populateEMRConfigs.py
-
-# Test some jobs
-
-cd $HOME/genie/genie-web/src/test/python/jobs
-export GENIE_TEST_PREFIX=file:///home/hadoop
-python hadoopFSTest.py
-
-python hiveJobTestWithAttachments.py
-
-python pigJobTestWithAttachments.py
diff --git a/deploy/aws/emr_genie_test.sh b/deploy/aws/emr_genie_test.sh
new file mode 100755
index 00000000000..af03ca9362e
--- /dev/null
+++ b/deploy/aws/emr_genie_test.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+##
+#
+#  Copyright 2013 Netflix, Inc.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.
+#
+##
+
+# Set up some environment variables for testing
+export SERVICE_BASE_URL=http://localhost:7001
+export GENIE_TEST_PREFIX=file:///home/hadoop
+
+cd $HOME/genie/genie-web/src/test/python/jobs
+
+# Test some jobs
+
+python hadoopFSTest.py
+
+python hiveJobTestWithAttachments.py
+
+python pigJobTestWithAttachments.py