diff --git a/bin/cassandra.in.sh b/bin/cassandra.in.sh
index 2d5a93204f..29e0d0e3da 100644
--- a/bin/cassandra.in.sh
+++ b/bin/cassandra.in.sh
@@ -39,3 +39,10 @@ CLASSPATH="$CASSANDRA_CONF:$cassandra_bin"
 for jar in "$CASSANDRA_HOME"/lib/*.jar; do
     CLASSPATH="$CLASSPATH:$jar"
 done
+
+# set JVM javaagent opts to avoid warnings/errors
+if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \
+      || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ]
+then
+    JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
+fi
\ No newline at end of file
diff --git a/bin/json2sstable b/bin/json2sstable
index f41afd3207..4a9e7bbed9 100755
--- a/bin/json2sstable
+++ b/bin/json2sstable
@@ -43,7 +43,7 @@ if [ -z "$CLASSPATH" ]; then
     exit 1
 fi
 
-"$JAVA" -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
+"$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.SSTableImport "$@"
 
diff --git a/bin/nodetool b/bin/nodetool
index d4c04396e2..3e3824ca6d 100755
--- a/bin/nodetool
+++ b/bin/nodetool
@@ -85,7 +85,7 @@ case "`uname`" in
     ;;
 esac
 
-"$JAVA" -cp "$CLASSPATH" \
+"$JAVA" $JAVA_AGENT -cp "$CLASSPATH" \
       -Xmx32m \
       -Dlog4j.configuration=log4j-tools.properties \
       -Dstorage-config="$CASSANDRA_CONF" \
diff --git a/bin/sstable2json b/bin/sstable2json
index 9b116ceb02..63e904d720 100755
--- a/bin/sstable2json
+++ b/bin/sstable2json
@@ -44,7 +44,7 @@ if [ -z "$CLASSPATH" ]; then
     exit 1
 fi
 
-"$JAVA" -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
+"$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.SSTableExport "$@"
 
diff --git a/bin/sstablekeys b/bin/sstablekeys
index 81cffd0808..32f03395e9 100755
--- a/bin/sstablekeys
+++ b/bin/sstablekeys
@@ -48,7 +48,7 @@ if [ $# -eq "0" ]; then
     exit 2
 fi
 
-"$JAVA" -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
+"$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.SSTableExport "$@" -e
 
diff --git a/bin/sstableloader b/bin/sstableloader
index 7696e10b8a..245775f2a5 100755
--- a/bin/sstableloader
+++ b/bin/sstableloader
@@ -43,7 +43,7 @@ if [ -z "$CLASSPATH" ]; then
     exit 1
 fi
 
-"$JAVA" -ea -cp "$CLASSPATH" -Xmx256M \
+"$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" -Xmx256M \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.BulkLoader "$@"
 
diff --git a/bin/sstablescrub b/bin/sstablescrub
index 1266ea7ebe..31ecf02c08 100755
--- a/bin/sstablescrub
+++ b/bin/sstablescrub
@@ -47,7 +47,7 @@ if [ "x$MAX_HEAP_SIZE" = "x" ]; then
     MAX_HEAP_SIZE="256M"
 fi
 
-"$JAVA" -ea -cp "$CLASSPATH" -Xmx$MAX_HEAP_SIZE \
+"$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" -Xmx$MAX_HEAP_SIZE \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.StandaloneScrubber "$@"
 
diff --git a/bin/sstablesplit b/bin/sstablesplit
index 933a67dfcd..81a423201f 100755
--- a/bin/sstablesplit
+++ b/bin/sstablesplit
@@ -43,7 +43,7 @@ if [ -z $CLASSPATH ]; then
     exit 1
 fi
 
-$JAVA -ea -cp $CLASSPATH -Xmx256M \
+$JAVA $JAVA_AGENT -ea -cp $CLASSPATH -Xmx256M \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.StandaloneSplitter "$@"
 
diff --git a/bin/sstableupgrade b/bin/sstableupgrade
index b5ddd6a2ec..5421786f89 100755
--- a/bin/sstableupgrade
+++ b/bin/sstableupgrade
@@ -47,7 +47,7 @@ if [ "x$MAX_HEAP_SIZE" = "x" ]; then
     MAX_HEAP_SIZE="256M"
 fi
 
-$JAVA -ea -cp $CLASSPATH -Xmx$MAX_HEAP_SIZE \
+$JAVA $JAVA_AGENT -ea -cp $CLASSPATH -Xmx$MAX_HEAP_SIZE \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.StandaloneUpgrader "$@"