diff --git a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java
index d8d109f6575..1b3a634c993 100644
--- a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java
+++ b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java
@@ -121,11 +121,12 @@ public class ModuleBasedContextFactoryTest {
 
     public static class InstantiationCounter {
         public static Integer count = 0;
+        private static final Object countLock = new Object();
 
         int myCount;
 
         public InstantiationCounter() {
-            synchronized (count) {
+            synchronized (countLock) {
                 myCount = count + 1;
                 count = myCount;
             }
diff --git a/services/console-proxy/rdpconsole/src/test/java/streamer/ByteBufferTest.java b/services/console-proxy/rdpconsole/src/test/java/streamer/ByteBufferTest.java
index 6bcfed91317..db6778e6898 100644
--- a/services/console-proxy/rdpconsole/src/test/java/streamer/ByteBufferTest.java
+++ b/services/console-proxy/rdpconsole/src/test/java/streamer/ByteBufferTest.java
@@ -64,7 +64,7 @@ public class ByteBufferTest {
     @Test
     public void testShiftByteBy32BitsDoesNothing() throws Exception {
         for (byte b : data) {
-            assertEquals(b, b << 32);
+            assertEquals(b, (long) b << 32);
         }
     }