diff --git a/src/Doppler.sol b/src/Doppler.sol
index ac444a34..5292475d 100644
--- a/src/Doppler.sol
+++ b/src/Doppler.sol
@@ -96,7 +96,7 @@ contract Doppler is BaseHook {
         /* Tick checks */
         // Starting tick must be greater than ending tick if isToken0
         // Ending tick must be greater than starting tick if isToken1
-        if (_startingTick != endingTick) {
+        if (_startingTick != _endingTick) {
             if (_isToken0 && _startingTick <= _endingTick) revert InvalidTickRange();
             if (!_isToken0 && _startingTick >= _endingTick) revert InvalidTickRange();
 
diff --git a/test/shared/BaseTest.sol b/test/shared/BaseTest.sol
index 1e5af22e..c3464984 100644
--- a/test/shared/BaseTest.sol
+++ b/test/shared/BaseTest.sol
@@ -152,8 +152,8 @@ contract BaseTest is Test, Deployers {
 
         // isToken0 ? startTick > endTick : endTick > startTick
         // In both cases, price(startTick) > price(endTick)
-        startTick = isToken0 ? int24(vm.envOr("START_TICK", DEFAULT_START_TICK)) : -int24(vm.envOr("START_TICK", DEFAULT_START_TICK));
-        endTick = isToken0 ? -int24(vm.envOr("END_TICK", DEFAULT_END_TICK)) : int24(vm.envOr("END_TICK", DEFAULT_END_TICK));
+        startTick = isToken0 ? int24(vm.envOr("START_TICK", DEFAULT_START_TICK)) : int24(vm.envOr("START_TICK", -DEFAULT_START_TICK));
+        endTick = isToken0 ? int24(vm.envOr("END_TICK", -DEFAULT_END_TICK)) : int24(vm.envOr("END_TICK", DEFAULT_END_TICK));
 
         // Default to feeless case because it's easier to reason about
         config.fee = uint24(vm.envOr("FEE", uint24(0)));