diff --git a/autodispose/src/main/java/com/uber/autodispose/AutoDisposingCompletableObserverImpl.java b/autodispose/src/main/java/com/uber/autodispose/AutoDisposingCompletableObserverImpl.java
index 00b956718..dc12b25c2 100755
--- a/autodispose/src/main/java/com/uber/autodispose/AutoDisposingCompletableObserverImpl.java
+++ b/autodispose/src/main/java/com/uber/autodispose/AutoDisposingCompletableObserverImpl.java
@@ -81,7 +81,8 @@ private void lazyDispose() {
     }
   }
 
-  private void callMainSubscribeIfNecessary(Disposable d) {
+  /* private */
+  void callMainSubscribeIfNecessary(Disposable d) {
     // If we've never actually called the downstream onSubscribe (i.e. requested immediately in
     // onSubscribe and had a terminal event), we need to still send an empty disposable instance
     // to abide by the Observer contract.
diff --git a/autodispose/src/main/java/com/uber/autodispose/AutoDisposingMaybeObserverImpl.java b/autodispose/src/main/java/com/uber/autodispose/AutoDisposingMaybeObserverImpl.java
index 2fd67be6e..5c594cacf 100755
--- a/autodispose/src/main/java/com/uber/autodispose/AutoDisposingMaybeObserverImpl.java
+++ b/autodispose/src/main/java/com/uber/autodispose/AutoDisposingMaybeObserverImpl.java
@@ -81,7 +81,8 @@ private void lazyDispose() {
     }
   }
 
-  private void callMainSubscribeIfNecessary(Disposable d) {
+  /* private */
+  void callMainSubscribeIfNecessary(Disposable d) {
     // If we've never actually called the downstream onSubscribe (i.e. requested immediately in
     // onSubscribe and had a terminal event), we need to still send an empty disposable instance
     // to abide by the Observer contract.
diff --git a/autodispose/src/main/java/com/uber/autodispose/AutoDisposingObserverImpl.java b/autodispose/src/main/java/com/uber/autodispose/AutoDisposingObserverImpl.java
index 031552ad0..8f5001ba7 100755
--- a/autodispose/src/main/java/com/uber/autodispose/AutoDisposingObserverImpl.java
+++ b/autodispose/src/main/java/com/uber/autodispose/AutoDisposingObserverImpl.java
@@ -81,7 +81,8 @@ private void lazyDispose() {
     }
   }
 
-  private void callMainSubscribeIfNecessary(Disposable d) {
+  /* private */
+  void callMainSubscribeIfNecessary(Disposable d) {
     // If we've never actually called the downstream onSubscribe (i.e. requested immediately in
     // onSubscribe and had a terminal event), we need to still send an empty disposable instance
     // to abide by the Observer contract.
diff --git a/autodispose/src/main/java/com/uber/autodispose/AutoDisposingSingleObserverImpl.java b/autodispose/src/main/java/com/uber/autodispose/AutoDisposingSingleObserverImpl.java
index e72980843..cefebb4fd 100755
--- a/autodispose/src/main/java/com/uber/autodispose/AutoDisposingSingleObserverImpl.java
+++ b/autodispose/src/main/java/com/uber/autodispose/AutoDisposingSingleObserverImpl.java
@@ -81,7 +81,8 @@ private void lazyDispose() {
     }
   }
 
-  private void callMainSubscribeIfNecessary(Disposable d) {
+  /* private */
+  void callMainSubscribeIfNecessary(Disposable d) {
     // If we've never actually called the downstream onSubscribe (i.e. requested immediately in
     // onSubscribe and had a terminal event), we need to still send an empty disposable instance
     // to abide by the Observer contract.
diff --git a/autodispose/src/main/java/com/uber/autodispose/AutoDisposingSubscriberImpl.java b/autodispose/src/main/java/com/uber/autodispose/AutoDisposingSubscriberImpl.java
index 151b6d643..873b98b0e 100755
--- a/autodispose/src/main/java/com/uber/autodispose/AutoDisposingSubscriberImpl.java
+++ b/autodispose/src/main/java/com/uber/autodispose/AutoDisposingSubscriberImpl.java
@@ -99,7 +99,8 @@ private void lazyCancel() {
     }
   }
 
-  private void callMainSubscribeIfNecessary(Subscription s) {
+  /* private */
+  void callMainSubscribeIfNecessary(Subscription s) {
     // If we've never actually started the upstream subscription (i.e. requested immediately in
     // onSubscribe and had a terminal event), we need to still send an empty subscription instance
     // to abide by the Subscriber contract.
diff --git a/test-utils/src/main/java/com/uber/autodispose/test/RecordingObserver.java b/test-utils/src/main/java/com/uber/autodispose/test/RecordingObserver.java
index 0f6a4fb5a..740bc7501 100644
--- a/test-utils/src/main/java/com/uber/autodispose/test/RecordingObserver.java
+++ b/test-utils/src/main/java/com/uber/autodispose/test/RecordingObserver.java
@@ -125,7 +125,8 @@ public void assertNoMoreEvents() {
   private final class OnNext {
     final T value;
 
-    private OnNext(T value) {
+    /* private */
+    OnNext(T value) {
       this.value = value;
     }
 
@@ -141,9 +142,11 @@ private static final class OnCompleted {
   }
 
   private static final class OnError {
-    private final Throwable throwable;
+    /* private */
+    final Throwable throwable;
 
-    private OnError(Throwable throwable) {
+    /* private */
+    OnError(Throwable throwable) {
       this.throwable = throwable;
     }
 
@@ -153,9 +156,11 @@ private OnError(Throwable throwable) {
   }
 
   private static final class OnSubscribe {
-    private final Disposable disposable;
+    /* private */
+    final Disposable disposable;
 
-    private OnSubscribe(Disposable disposable) {
+    /* private */
+    OnSubscribe(Disposable disposable) {
       this.disposable = disposable;
     }
 
@@ -165,9 +170,11 @@ private OnSubscribe(Disposable disposable) {
   }
 
   private final class OnSuccess {
-    private final T value;
+    /* private */
+    final T value;
 
-    private OnSuccess(T value) {
+    /* private */
+    OnSuccess(T value) {
       this.value = value;
     }