diff --git a/pytest-wdl-tests/tests/call_input_blocks/call_input_blocks_overrides_previous_input/test_call_input_block_overrides_previous_input.py b/pytest-wdl-tests/tests/expr/call_input_blocks/call_input_blocks_overrides_previous_input/test_call_input_block_overrides_previous_input.py
similarity index 100%
rename from pytest-wdl-tests/tests/call_input_blocks/call_input_blocks_overrides_previous_input/test_call_input_block_overrides_previous_input.py
rename to pytest-wdl-tests/tests/expr/call_input_blocks/call_input_blocks_overrides_previous_input/test_call_input_block_overrides_previous_input.py
diff --git a/pytest-wdl-tests/tests/call_input_blocks/call_input_blocks_overrides_previous_input/test_call_input_block_overrides_previous_input.wdl b/pytest-wdl-tests/tests/expr/call_input_blocks/call_input_blocks_overrides_previous_input/test_call_input_block_overrides_previous_input.wdl
similarity index 100%
rename from pytest-wdl-tests/tests/call_input_blocks/call_input_blocks_overrides_previous_input/test_call_input_block_overrides_previous_input.wdl
rename to pytest-wdl-tests/tests/expr/call_input_blocks/call_input_blocks_overrides_previous_input/test_call_input_block_overrides_previous_input.wdl
diff --git a/pytest-wdl-tests/tests/call_input_blocks/call_input_overriden_by_workflow_input/test_call_input_overriden_by_workflow_input.py b/pytest-wdl-tests/tests/expr/call_input_blocks/call_input_overriden_by_workflow_input/test_call_input_overriden_by_workflow_input.py
similarity index 100%
rename from pytest-wdl-tests/tests/call_input_blocks/call_input_overriden_by_workflow_input/test_call_input_overriden_by_workflow_input.py
rename to pytest-wdl-tests/tests/expr/call_input_blocks/call_input_overriden_by_workflow_input/test_call_input_overriden_by_workflow_input.py
diff --git a/pytest-wdl-tests/tests/call_input_blocks/call_input_overriden_by_workflow_input/test_call_input_overriden_by_workflow_input.wdl b/pytest-wdl-tests/tests/expr/call_input_blocks/call_input_overriden_by_workflow_input/test_call_input_overriden_by_workflow_input.wdl
similarity index 100%
rename from pytest-wdl-tests/tests/call_input_blocks/call_input_overriden_by_workflow_input/test_call_input_overriden_by_workflow_input.wdl
rename to pytest-wdl-tests/tests/expr/call_input_blocks/call_input_overriden_by_workflow_input/test_call_input_overriden_by_workflow_input.wdl