diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java
index ab36596e85..32c10bf421 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java
@@ -31,7 +31,7 @@ public final class WebSocketSslServerSslContext {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(WebSocketSslServerSslContext.class);
     private static final String PROTOCOL = "TLS";
-    private SSLContext _serverContext;
+    private final SSLContext _serverContext;
 
     /**
      * Returns the singleton instance for this class
diff --git a/src/main/java/org/jboss/netty/handler/stream/ChunkedNioFile.java b/src/main/java/org/jboss/netty/handler/stream/ChunkedNioFile.java
index c887df269c..ea225a49ea 100644
--- a/src/main/java/org/jboss/netty/handler/stream/ChunkedNioFile.java
+++ b/src/main/java/org/jboss/netty/handler/stream/ChunkedNioFile.java
@@ -15,7 +15,7 @@
  */
 package org.jboss.netty.handler.stream;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import org.jboss.netty.channel.FileRegion;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 
-import org.jboss.netty.channel.FileRegion;
+import static org.jboss.netty.buffer.ChannelBuffers.*;
 
 /**
  * A {@link ChunkedInput} that fetches data from a file chunk by chunk using
@@ -36,7 +36,7 @@ import org.jboss.netty.channel.FileRegion;
 public class ChunkedNioFile implements ChunkedInput {
 
     private final FileChannel in;
-    private long startOffset;
+    private final long startOffset;
     private final long endOffset;
     private final int chunkSize;
     private long offset;
diff --git a/src/test/java/org/jboss/netty/channel/local/LocalAddressTest.java b/src/test/java/org/jboss/netty/channel/local/LocalAddressTest.java
index 7f6264c344..94311c5747 100644
--- a/src/test/java/org/jboss/netty/channel/local/LocalAddressTest.java
+++ b/src/test/java/org/jboss/netty/channel/local/LocalAddressTest.java
@@ -28,7 +28,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class LocalAddressTest {
-    private static String LOCAL_ADDR_ID = "test.id";
+    private static final String LOCAL_ADDR_ID = "test.id";
 
     @Test
     public void localConnectOK()
diff --git a/src/test/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java b/src/test/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java
index a5c5281d82..46e16bce76 100644
--- a/src/test/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java
@@ -159,7 +159,7 @@ public class WebSocketServerProtocolHandlerTest {
     
     private static class HttpResponseInterceptor extends HttpResponseEncoder {
         
-        private Queue<HttpResponse> responses = new LinkedList<HttpResponse>();
+        private final Queue<HttpResponse> responses = new LinkedList<HttpResponse>();
 
         @Override
         protected Object encode(ChannelHandlerContext ctx, Channel channel, Object msg) throws Exception {
diff --git a/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBufferTest.java b/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBufferTest.java
index 7250fd4f68..da9cdb5092 100644
--- a/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBufferTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBufferTest.java
@@ -72,7 +72,7 @@ public class ReplayingDecoderBufferTest {
     }
     
     private class ReplayDecoderImpl extends ReplayingDecoder<VoidEnum> {
-        private ChannelBuffer internal = ChannelBuffers.copiedBuffer("TestBuffer", CharsetUtil.ISO_8859_1);
+        private final ChannelBuffer internal = ChannelBuffers.copiedBuffer("TestBuffer", CharsetUtil.ISO_8859_1);
         
         @Override
         protected ChannelBuffer internalBuffer() {
diff --git a/src/test/java/org/jboss/netty/handler/execution/ExecutionHandlerTest.java b/src/test/java/org/jboss/netty/handler/execution/ExecutionHandlerTest.java
index 525af9f587..e646765098 100644
--- a/src/test/java/org/jboss/netty/handler/execution/ExecutionHandlerTest.java
+++ b/src/test/java/org/jboss/netty/handler/execution/ExecutionHandlerTest.java
@@ -75,7 +75,7 @@ public class ExecutionHandlerTest {
 
         private final CountDownLatch latch;
         private final ExecutionHandler handler;
-        private Channel channel;
+        private final Channel channel;
 
         public TestChannelHandlerContext(Channel channel, ExecutionHandler handler, CountDownLatch latch) {
             this.latch = latch;
diff --git a/src/test/java/org/jboss/netty/handler/stream/ChunkedWriteHandlerTest.java b/src/test/java/org/jboss/netty/handler/stream/ChunkedWriteHandlerTest.java
index 8a0d09f0bf..9809a3d02f 100644
--- a/src/test/java/org/jboss/netty/handler/stream/ChunkedWriteHandlerTest.java
+++ b/src/test/java/org/jboss/netty/handler/stream/ChunkedWriteHandlerTest.java
@@ -99,7 +99,7 @@ public class ChunkedWriteHandlerTest {
                 
         ChunkedInput input = new ChunkedInput() {
             private boolean done;
-            private ChannelBuffer buffer = ChannelBuffers.copiedBuffer("Test", CharsetUtil.ISO_8859_1);
+            private final ChannelBuffer buffer = ChannelBuffers.copiedBuffer("Test", CharsetUtil.ISO_8859_1);
             
             public Object nextChunk() throws Exception {
                 done = true;